From 4e4525c85e795a42231ffbb0e8e10c027d50a682 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Wed, 17 Aug 2016 10:53:19 -0400 Subject: [PATCH] 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 Signed-off-by: Mike Rylander --- Open-ILS/src/extras/install/Makefile.debian-jessie | 3 +++ Open-ILS/src/extras/install/Makefile.ubuntu-xenial | 3 +++ 2 files changed, 6 insertions(+) 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 diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial index 726fdbb254..ae37fe01b0 100644 --- 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 -- 2.11.0