From: Elan Ruusamäe <glen@delfi.ee>
Date: Thu, 27 Feb 2014 17:29:19 +0000 (+0200)
Subject: tabs
X-Git-Tag: auto/th/apache-2.4.7-2~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=65a5c114e257d4ff944a88fd08de6b8cd8df0151

tabs
---

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