- drop included apr/apr-util

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 9cf9e6f592bc488d9812018c2dc46d0c6fc6c95f..dcadaf92f2d0b99a0e8a7f9da20e6336ee0ae655 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -22,37 +22,87 @@
 [ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # Check that networking is up.
-[ "${NETWORKING}" = "no" ] && echo "Error: Networking is down"; exit 0
+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)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
-               show Starting httpd
-               daemon httpd
+               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
-               echo "httpd already is running"
+               msg_already_running httpd.${HTTPD_MPM}
        fi
-       touch /var/lock/subsys/httpd
        ;;
   stop)
-       show Shutting down httpd
-       killproc httpd  
-       rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc*
+       # 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 [ -z "$PID" ]; then
+                               PID=0
+                       fi
+               else
+                       PID=0
+               fi
+               daemon httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -k stop
+               RET=$?
+               # Wait for httpd to really stop
+               if [ ! $PID -eq 0 -a $RET -eq 0 ]; then
+                       show "Waiting for httpd to stop"
+                       busy
+                       while ps -o command $PID | grep -q ^httpd
+                       do
+                               sleep 1
+                       done
+                       ok
+               fi
+               # Delete pidfile only when apache was called successfully
+               if [ $RET -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
        ;;
   status)
-       status httpd
+       status httpd.${HTTPD_MPM}
+       RETVAL=$?
+       /usr/sbin/httpd.${HTTPD_MPM} -f /etc/httpd/httpd.conf -S
        ;;
-  restart|reload)
-       $0 stop
+  restart)
+       $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