- wait for httpd to really stop

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 10f79865dc458f679b39fc2b0bc72b496d668f36..8203f33bd7ff136ad7e6ea8a51e72fc4831ff132 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -1,48 +1,101 @@
-#!/bin/bash
+#!/bin/sh
 #
-# Startup script for the Apache Web Server
+# apache       Apache Web Server
 #
-# chkconfig: 345 85 15
-# description: Apache is a World Wide Web server.  It is used to serve \
-# HTML files and CGI.
-# processname: httpd
-# pidfile: /var/run/httpd.pid
-# config: /etc/httpd/conf/access.conf
-# config: /etc/httpd/conf/httpd.conf
-# config: /etc/httpd/conf/srm.conf
-
-# Source function library.
+# chkconfig:   345 85 15
+# description: Apache is a World Wide Web server.  It is used to serve \
+#              HTML files and CGI.
+# processname: httpd
+# pidfile:     /var/run/httpd.pid
+# config:      /etc/httpd/conf/access.conf
+# config:      /etc/httpd/conf/httpd.conf
+# config:      /etc/httpd/conf/srm.conf
+
+
+# Source function library
 . /etc/rc.d/init.d/functions
 
+# Get network config
+. /etc/sysconfig/network
+
+# Get service config
+[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
+
 # Check that networking is up.
-[ "${NETWORKING}" = "no" ] && exit0
+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
+else
+       exit 0
+fi
+
+[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-       show Starting httpd
-       daemon +5 httpd 
-       touch /var/lock/subsys/httpd
+       # 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
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
+       else
+               msg_already_running httpd.${HTTPD_MPM}
+       fi
        ;;
   stop)
-       show Shutting down httpd
-       killproc httpd  
-       rm -f /var/lock/subsys/httpd /var/run/httpd.pid
+       # Stop daemons.
+       if [ -f /var/lock/subsys/httpd ]; then
+               msg_stopping httpd.${HTTPD_MPM}
+               if [ -f /var/run/httpd.pid ]; then
+                       PID=`cat /var/run/httpd.pid`
+               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 ax | grep $PID.\*httpd > /dev/null
+                       do
+                               sleep 1
+                       done
+                       ok
+               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
        ;;
   status)
-       status httpd
+       status httpd.${HTTPD_MPM}
+       RETVAL=$?
+       /usr/sbin/httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -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
+               RETVAL=$?
+       else
+               msg_not_running httpd.${HTTPD_MPM} >&2
+               RETVAL=7
+       fi
+       ;;
   *)
-       echo "Usage: $0 {start|stop|restart|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       exit 3
        ;;
 esac
 
-exit 0
-
-
-
+exit $RETVAL