- rel 2

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 78321d2ee9d83745050ecef693b3429ec5ada60f..64e6cadf45073a9ab399e448c89afa814229c441 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -7,10 +7,7 @@
 #              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
-
+# config:      /etc/httpd/apache.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -60,12 +57,8 @@ case "$1" in
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
-               [ -n "$(pidofproc httpd.${HTTPD_MPM})" ] && OPT="--waitforname httpd.${HTTPD_MPM} --waitfortime 60" || OPT=
-               killproc --pidfile /var/run/httpd.pid $OPT httpd.${HTTPD_MPM}
-               # 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
+               killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
+               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
@@ -89,10 +82,26 @@ case "$1" in
                        RETVAL=$?
                fi
        else
-               msg_not_running httpd.${HTTPD_MPM} >&2
+               msg_not_running httpd.${HTTPD_MPM}
+               RETVAL=7
+       fi
+       ;;
+  force-reload)
+       if [ -f /var/lock/subsys/httpd ]; then
+               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       msg_reloading httpd.${HTTPD_MPM}
+                       # forced reload
+                       daemon httpd.${HTTPD_MPM} $CFG -k restart
+                       RETVAL=$?
+               fi
+       else
+               msg_not_running httpd.${HTTPD_MPM}
                RETVAL=7
        fi
        ;;
+
   *)
        msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
        exit 3