- graceful reload support

[packages/apache.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index d659c0c242bc25dbbe012e5bfa89171528b2373c..9e6a87c871d42c54664c4fda7eaa691ca3bb6753 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -21,7 +21,7 @@
 
 # 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
@@ -34,6 +34,7 @@ if is_no "${IPV6_NETWORKING}"; then
        HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
@@ -45,7 +46,6 @@ case "$1" in
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
                msg_already_running httpd
-               exit 1
        fi
        ;;
   stop)
@@ -56,21 +56,41 @@ case "$1" in
                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd
-               exit 1
        fi
        ;;
   status)
        status httpd
+       RETVAL=$?
        /usr/sbin/httpd -S
-       exit $?
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
+       exit $?
+       ;;
+  reload|force-reload)
+       if [ -f /var/lock/subsys/httpd ]; then
+               msg_reloading httpd
+               killproc httpd -HUP
+               RETVAL=$?
+       else
+               msg_not_running httpd >&2
+               RETVAL=7
+       fi
+       ;;
+  graceful)
+       if [ -f /var/lock/subsys/httpd ]; then
+               msg_reloading httpd
+               killproc httpd -USR1
+               RETVAL=$?
+        else
+               msg_not_running httpd >&2
+               RETVAL=7
+       fi
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       exit 3
        ;;
 esac