From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 17 Aug 2016 15:01:26 +0000 (-0400)
Subject: LP#1476049: disable serve-cgi-bin Apache config on Jessie
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=172b2317d6fc11685cc6a2ca7ac5fddb9a1b4f97;p=Evergreen.git

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

This patch ensures that the stock Apache configuration
"serve-cgi-bin" is disabled when installing on Debian Jessie,
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; 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 030857c15f..e76a60ebcf 100644
--- 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