LP#1383828 Jessie/Trusty installer Apache "mpm" repairs

Disable the default Apache mpm_event module and enable mpm_prefork for
Debian Jessie and Ubuntu Trusty.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Ben Shum <bshum@biblio.org>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index edcd61a..dbb21ae 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -194,7 +194,7 @@ all:
 debian-jessie: generic_debian jessie
 debian-wheezy: generic_debian wheezy
 debian-squeeze: generic_debian squeeze
-jessie: install_extra_debs_jessie
+jessie: install_extra_debs_jessie apache_mpm_prefork_mods
 wheezy: install_extra_debs_wheezy
 squeeze: install_extra_debs_squeeze
 generic_debian: install_debs debian_sys_config
@@ -202,7 +202,7 @@ generic_debian: install_debs debian_sys_config
 fedora: install_fedora_rpms
 
 ubuntu-precise: generic_ubuntu precise
-ubuntu-trusty: generic_ubuntu trusty
+ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
 precise: install_extra_debs install_extra_debs_precise
 trusty: install_extra_debs install_extra_debs_trusty
 generic_ubuntu: install_debs debian_sys_config
@@ -244,6 +244,12 @@ install_extra_debs_precise:
 install_extra_debs_trusty:
        $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_TRUSTY)
 
+# Some OSes activate the Apache mpm_event module by default.
+# OpenSRF requires prefork.
+apache_mpm_prefork_mods:
+       a2dismod mpm_event
+       a2enmod mpm_prefork
+
 # Fedora
 install_fedora_rpms:
        yum -y install $(FEDORAS)