[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. e61a8085f9edabd97600b072c1a3ea41cd14265b

[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 "Evergreen ILS".

The branch, master has been updated
       via  e61a8085f9edabd97600b072c1a3ea41cd14265b (commit)
       via  0bee17b1ffd741bfcfced9ae7eb2d8d9cf59044f (commit)
      from  1eaa465e86c4bb79de41550d36a2f5fd7d813f68 (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 e61a8085f9edabd97600b072c1a3ea41cd14265b
Author: Ben Shum <bshum at biblio.org>
Date:   Mon Jul 14 11:44:07 2014 -0400

    LP#1341013: Load apache mod CGI
    
    As of Apache 2.4, mod CGI needs to be enabled directly and is not built
    with apache.  So let's add it to the Makefile for Ubuntu Trusty 14.04.
    
    Also, add handling for disabling unwanted apache conf like serve-cgi-bin,
    which can break offline cgi-bin script alias.
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian
index 892569b..8f6c499 100644
--- a/Open-ILS/src/extras/install/Makefile.debian
+++ b/Open-ILS/src/extras/install/Makefile.debian
@@ -46,6 +46,8 @@ debian_sys_config:
 	for m in $(DEB_APACHE_MODS); do a2enmod $$m; done;
 	# keep the bad apache modules away
 	for m in $(DEB_APACHE_DISMODS); do a2dismod $$m; done;
+	# keep the bad apache configs away
+	for m in $(DEB_APACHE_DISCONF); do a2disconf $$m; done;
 	# refresh the dynamic library cache
 	ldconfig
 
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 5050991..5e6e307 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -64,6 +64,7 @@ export DEBS = \
 	yaz
 
 export DEB_APACHE_MODS = \
+    cgi\
     expires\
     include\
     proxy\
@@ -73,6 +74,9 @@ export DEB_APACHE_MODS = \
 export DEB_APACHE_DISMODS = \
     deflate
 
+export DEB_APACHE_DISCONF = \
+    serve-cgi-bin
+
 export CPAN_MODULES = \
 	Business::CreditCard::Object \
 	Business::OnlinePayment::PayPal \

commit 0bee17b1ffd741bfcfced9ae7eb2d8d9cf59044f
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Fri Jul 11 10:57:59 2014 -0400

    LP#1341013: Remove NameVirtualHost from eg.conf.in for Apache 2.4.
    
    NameVirtualHost does nothing in Apache 2.4 and will be removed in
    the next release.  We might as well get rid of it now and silence
    a warning when starting Apache.
    
    Signed-off-by: Jason Stephenson <jason at sigio.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/examples/apache_24/eg.conf.in b/Open-ILS/examples/apache_24/eg.conf.in
index b9c373c..b33581d 100644
--- a/Open-ILS/examples/apache_24/eg.conf.in
+++ b/Open-ILS/examples/apache_24/eg.conf.in
@@ -100,7 +100,6 @@ ExpiresByType text/css "access plus 50 minutes"
 # Set up our SSL virtual host
 # ----------------------------------------------------------------------------------
 #Listen 443
-NameVirtualHost *:443
 <VirtualHost *:443>
 	DocumentRoot "@localstatedir@/web"
 	ServerName localhost:443
@@ -135,8 +134,6 @@ NameVirtualHost *:443
 # errors, per http://wiki.apache.org/httpd/InternalDummyConnection
 # ----------------------------------------------------------------------------------
 
-# Commented to avoid warnings from duplicate "NameVirtualHost: *80" directives
-#NameVirtualHost *:80
 <VirtualHost *:80>
 	ServerName localhost:80
 	ServerAlias 127.0.0.1:80

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

Summary of changes:
 Open-ILS/examples/apache_24/eg.conf.in             |    3 ---
 Open-ILS/src/extras/install/Makefile.debian        |    2 ++
 Open-ILS/src/extras/install/Makefile.ubuntu-trusty |    4 ++++
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS