LP#1476049: disable serve-cgi-bin Apache config on Jessie and Xenial

This patch ensures that the stock Apache configuration
"serve-cgi-bin" is disabled when installing on Debian Jessie
and Ubuntu Xenial, as otherwise the default cgi-bin location
can override what Evergreen specifies for offline.pl.

To test:

[1] Run the Makefile.install step on Jessie or Xenial; verify
    that there is no /etc/apache2/conf-enabled/serve-cgi-bin.conf
    symlink.
[2] Proceed with the rest of the Evergreen installation; verify
    that the Apache error log doesn't contain a warning like this:

    "The Alias directive in /etc/apache2/sites-enabled/eg.conf ...
     will probably never match because it overlaps an earlier
     ScriptAlias."

[3] For extra credit, verify that one can access offline circulation
    sessions.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 030857c..e76a60e 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -85,6 +85,9 @@ export DEB_APACHE_MODS = \
 export DEB_APACHE_DISMODS = \
     deflate
 
+export DEB_APACHE_DISCONF = \
+    serve-cgi-bin
+
 export CPAN_MODULES = \
        Business::OnlinePayment::PayPal \
        Email::Send

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
index 726fdbb..ae37fe0 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
@@ -84,6 +84,9 @@ export DEB_APACHE_MODS = \
 export DEB_APACHE_DISMODS = \
     deflate
 
+export DEB_APACHE_DISCONF = \
+    serve-cgi-bin
+
 export CPAN_MODULES = \
        Business::OnlinePayment::PayPal \
        Email::Send