commit 65a5c114e257d4ff944a88fd08de6b8cd8df0151
Author: Elan Ruusamäe <[email protected]>
Date: Thu Feb 27 19:29:19 2014 +0200
tabs
apache.spec | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index f85c717..d0c4413 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2952,14 +2952,16 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
install -d /etc/httpd
ln -s conf.d /etc/httpd/httpd.conf
fi
+
+# handle $HTTPD_MPM from sysconfig
if [ -f /etc/sysconfig/httpd ]; then
- MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd |sed
's,HTTPD_MPM=,,;s,",,g')
- if [ -n "$MPM" ]; then
- echo "LoadModule mpm_${MPM}_module
modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew
- cat /etc/httpd/conf.d/10_mpm.conf >>
/etc/httpd/conf.d/10_mpm.conf.rpmnew
- mv /etc/httpd/conf.d/10_mpm.conf.rpmnew
/etc/httpd/conf.d/10_mpm.conf
- sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
- fi
+ MPM=$(grep ^HTTPD_MPM /etc/sysconfig/httpd | sed
's,HTTPD_MPM=,,;s,",,g')
+ if [ -n "$MPM" ]; then
+ echo "LoadModule mpm_${MPM}_module
modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.d/10_mpm.conf.rpmnew
+ cat /etc/httpd/conf.d/10_mpm.conf >>
/etc/httpd/conf.d/10_mpm.conf.rpmnew
+ mv -f /etc/httpd/conf.d/10_mpm.conf.rpmnew
/etc/httpd/conf.d/10_mpm.conf
+ sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
+ fi
fi
exit 0
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/65a5c114e257d4ff944a88fd08de6b8cd8df0151
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
