From e61a8085f9edabd97600b072c1a3ea41cd14265b Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Mon, 14 Jul 2014 11:44:07 -0400 Subject: [PATCH] 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 Signed-off-by: Jason Stephenson --- Open-ILS/src/extras/install/Makefile.debian | 2 ++ Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Open-ILS/src/extras/install/Makefile.debian b/Open-ILS/src/extras/install/Makefile.debian index 892569b1eb..8f6c4994c2 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 5050991f36..5e6e307463 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 \ -- 2.43.2