***SPAM*** [OpenSRF-GIT] OpenSRF branch master updated. 0c31fd33b8f5b55e24eba5862fca7be9ff3fc213

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  0c31fd33b8f5b55e24eba5862fca7be9ff3fc213 (commit)
      from  db4e107a1bad0cb5204c4946b805d11252446d3f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c31fd33b8f5b55e24eba5862fca7be9ff3fc213
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Oct 17 17:07:53 2014 -0400

    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 at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index edcd61a..dbb21ae 100644
--- 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)

-----------------------------------------------------------------------

Summary of changes:
 src/extras/Makefile.install |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
OpenSRF