- up to 2.0.59

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 468da5459de4e52f1ce1569aad350cb2c4e7c188..fe83adda65bbb608999d4281d0bc6be8ca9c6350 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -19,7 +19,7 @@
 . /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
@@ -33,6 +33,14 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
+if [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
+       CFG="-f ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
+elif [ -n "$HTTPD_CONF" ]; then
+       echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
+       exit 1
+else
+       CFG=""
+fi
 
 RETVAL=0
 # See how we were called.
@@ -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,8 +60,12 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k stop
-               rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
+               [ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
+               daemon $OPT httpd.${HTTPD_MPM} $CFG -k stop
+               # 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
        else
                msg_not_running httpd.${HTTPD_MPM}
        fi
@@ -61,17 +73,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