[OpenSRF-GIT] OpenSRF branch master updated. af4ab2355707083a22a2828202a541bf0e718bc0

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  af4ab2355707083a22a2828202a541bf0e718bc0 (commit)
      from  ea72acaf798f3fc6cc0aae8d93771c6dc2a21a57 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af4ab2355707083a22a2828202a541bf0e718bc0
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Thu May 11 14:47:32 2017 -0400

    LP#1690206 - remove check of httpd.conf from OpenSRF Makefile.install
    
    The original src/extras/Makefile.install included a grep of the
    file /etc/apache2/httpd.conf, which is no longer installed by default
    on supported Debian and Ubuntu releases.  As this check results in
    an error message, it makes sense to remove the check altogether.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index 39d7ed4..10e56ef 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -200,12 +200,6 @@ debian_sys_config:
 	# link the apache modules in
 	for m in $(DEB_APACHE_MODS); do a2enmod $$m; done;
 
-	# adds a placeholder module so apxs will be happy
-	if [ ! "$$(grep mod_placeholder /etc/apache2/httpd.conf)" ]; then \
-		echo -e "#\n#LoadModule mod_placeholder /usr/lib/apache2/modules/mod_placeholder.so" \
-			>> /etc/apache2/httpd.conf; \
-	fi;
-
 # Install the debian-specific dependencies
 install_debs:
 	$(APT_TOOL) install $(DEBS)

-----------------------------------------------------------------------

Summary of changes:
 src/extras/Makefile.install |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
OpenSRF