- new from 2.2 branch

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index a3ddb94d7433e1d523ae1416dc9b7dd61e0765b6..ba1026959b2617f45ba8959ade1b9e9d08ab47e5 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -19,12 +19,11 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
+[ -f /etc/sysconfig/httpd ] && . /etc/sysconfig/httpd
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down httpd
                exit 1
        fi
@@ -34,6 +33,15 @@ fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
 
+if [ -n "${HTTPD_CONF}" ]; then
+       if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
+               CFG="-f ${HTTPD_CONF}"
+       else
+               echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
+               exit 1
+       fi
+fi
+
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -41,7 +49,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf $HTTPD_OPTS
+               daemon httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
@@ -52,26 +60,11 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               if [ -f /var/run/httpd.pid ]; then
-                       PID=$(filter_chroot `cat /var/run/httpd.pid`)
-                       if [ ! $PID ]; then
-                               PID=0
-                       fi
-               else
-                       PID=0
-               fi
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k stop
-               # Wait for httpd to really stop
-               if [ ! $PID -eq 0 ]; then
-                       show "Waiting for httpd to stop"
-                       busy
-                       while ps -o command $PID | grep -q ^httpd
-                       do
-                               sleep 1
-                       done
-                       ok
+               killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
+               # Delete pidfile only when apache was called successfully
+               if [ $? -eq 0 ]; then
+                       rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
                fi
-               rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd.${HTTPD_MPM}
        fi
@@ -79,17 +72,21 @@ case "$1" in
   status)
        status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -S
+       /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
        ;;
   restart)
-       $0 stop
+       $0 stop
        $0 start
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k graceful
+               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
                RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       msg_reloading httpd.${HTTPD_MPM}
+                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       RETVAL=$?
+               fi
        else
                msg_not_running httpd.${HTTPD_MPM} >&2
                RETVAL=7