- fix status

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 366dec223a38140c23d61417697ae7e1125cfaf7..989b86c24bfe954e6c3298c8902ce6d8c902adeb 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -24,14 +24,10 @@
 # Check that networking is up.
 if is_no "${NETWORKING}"; then
         # nls "ERROR: Networking is down. %s can't be run." <service>
-        msg_Network_Down httpd
+        msg_network_down httpd
         exit 1
 fi
 
-if is_no ${IPV6_NETWORKING}; then
-        HTTPD_OPTS="$HTTPD_OPTS -4"
-fi
-
 # See how we were called.
 case "$1" in
   start)
@@ -42,7 +38,7 @@ case "$1" in
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_Already_Running httpd
+               msg_already_running httpd
                exit 1
        fi
        ;;
@@ -53,21 +49,26 @@ case "$1" in
                 killproc httpd
                 rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
         else
-               msg_Not_Running httpd
+               msg_not_running httpd
                exit 1
        fi
        ;;
   status)
        status httpd
-       /usr/sbin/httpd -S
+       /usr/sbin/httpd -t -D DUMP_VHOSTS
        exit $?
        ;;
-  restart|reload)
+  restart)
        $0 stop
        $0 start
        ;;
+   reload)
+       msg_reloading httpd
+       killproc httpd -HUP
+       RETVAL=$?
+       ;;
   *)
-       msg_Usage "$0 {start|stop|restart|status}"
+       msg_usage "$0 {start|stop|restart|reload|status}"
        exit 1
        ;;
 esac