[packages/apache/feat/conf-modules: 25/26] partial update triggers for new paths

[glen]

commit f8ce805238acc7593f6208fb254bb62038c37d79
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat May 2 20:36:24 2015 +0300

    partial update triggers for new paths

 apache.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index e1e7bce..088e5c2 100644
--- a/apache.spec
+++ b/apache.spec
@@ -2912,13 +2912,13 @@ if [ ! -L /etc/httpd/httpd.conf ]; then
 	ln -s conf.d /etc/httpd/httpd.conf
 fi
 
-# handle $HTTPD_MPM from sysconfig
+# upgrade to 2.4: 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 -f /etc/httpd/conf.d/10_mpm.conf.rpmnew /etc/httpd/conf.d/10_mpm.conf
+		echo "LoadModule mpm_${MPM}_module	modules/mod_mpm_${MPM}.so" > /etc/httpd/conf.modules.d/00-mpm.conf.rpmnew
+		cat /etc/httpd/conf.modules.d/00-mpm.conf >> /etc/httpd/conf.modules.d/00-mpm.conf.rpmnew
+		mv -bf /etc/httpd/conf.modules.d/00-mpm.conf{.rpmnew,}
 		sed -i -e 's,HTTPD_MPM.*,,g' /etc/sysconfig/httpd
 	fi
 fi
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/a310d9961edb669ed8e5898368a88f47e282311b