up to 2.0.65

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
old mode 100644 (file)
new mode 100755 (executable)
index ef9afb8..fe83add
--- a/apache.init
+++ b/apache.init
@@ -19,11 +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 ]; 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
@@ -32,52 +32,69 @@ else
        exit 0
 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.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
-               msg_starting httpd
-               daemon httpd $HTTPD_OPTS
+               msg_starting httpd.${HTTPD_MPM}
+               daemon httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_already_running httpd
+               msg_already_running httpd.${HTTPD_MPM}
        fi
        ;;
   stop)
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_stopping httpd
-               killproc httpd
-               rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
+               msg_stopping httpd.${HTTPD_MPM}
+               [ -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
+               msg_not_running httpd.${HTTPD_MPM}
        fi
        ;;
   status)
-       status httpd
+       status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd -S
+       /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
        ;;
   restart)
        $0 stop
        $0 start
-       exit $?
        ;;
-  reload|force-reload)
+  reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd
-               killproc httpd -HUP
+               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 >&2
+               msg_not_running httpd.${HTTPD_MPM} >&2
                RETVAL=7
        fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
        exit 3
        ;;
 esac