- reload is now done as graceful one

Changed files:
    apache.init -> 1.22

diff --git a/apache.init b/apache.init
index 6c87bf46f81718f5528fd5e30d33670a95596a41..e2448a60f8d5f64e9400fb6d10cf8314cd815ef3 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -50,8 +50,7 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd
-               killproc httpd
-               sleep 1
+               daemon httpd -k stop
                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
                msg_not_running httpd
@@ -63,30 +62,19 @@ case "$1" in
        /usr/sbin/httpd -S
        ;;
   restart)
-       $0 stop
+       $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
+               daemon httpd -k graceful
                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|force-reload|graceful|status}"
        exit 3