]> granicus.if.org Git - apache/commitdiff
RPM spec file: Make the httpd init script consistent with the htcacheclean
authorGraham Leggett <minfrin@apache.org>
Tue, 8 Feb 2011 22:51:31 +0000 (22:51 +0000)
committerGraham Leggett <minfrin@apache.org>
Tue, 8 Feb 2011 22:51:31 +0000 (22:51 +0000)
init script. Multiple daemons can be started by creating symlinks to the
init script.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1068660 13f79535-47bb-0310-9956-ffa450edef68

build/rpm/httpd.init

index 0d84d595f199497c0677f93bb3c2d1d220e435a4..909aeeb5e24606e915d695ee1c868a495d0b701a 100755 (executable)
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-if [ -f /etc/sysconfig/httpd ]; then
-        . /etc/sysconfig/httpd
+# What were we called? Multiple instances of the same daemon can be
+# created by creating suitably named symlinks to this startup script
+prog=$(basename $0 | sed -e 's/^[SK][0-9][0-9]//')
+
+if [ -f /etc/sysconfig/${prog} ]; then
+        . /etc/sysconfig/${prog}
 fi
 
 # Start httpd in the C locale by default.
@@ -54,9 +58,8 @@ INITLOG_ARGS=""
 # work correctly with a thread-based MPM; notably PHP will refuse to start.
 
 httpd=${HTTPD-/usr/sbin/httpd}
-prog=httpd
-pidfile=${PIDFILE-/var/log/httpd/httpd.pid}
-lockfile=${LOCKFILE-/var/lock/subsys/httpd}
+pidfile=${PIDFILE-/var/log/httpd/${prog}.pid}
+lockfile=${LOCKFILE-/var/lock/subsys/${prog}}
 RETVAL=0
 
 # check for 1.3 configuration