- unify apache initscripts

[packages/apache.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index cdcfe019762fbad0a5cad9f96d4e9ebe6f7998a7..5503f205ff94d83ec1753675060c2507e3849968 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -87,13 +87,13 @@ restart() {
                start
        else
                fail
-               echo >&2 "Configuration file syntax test failed."
+               echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
        fi
 }
 
 reload() {
-       sig=${1:-HUP}
-       retnr=${2:-7}
+       local sig=${1:-HUP}
+       local retnr=${2:-7}
        if [ -f /var/lock/subsys/apache ]; then
                msg_reloading apache
 
@@ -103,7 +103,7 @@ reload() {
                        RETVAL=$?
                else
                        fail
-                       echo >&2 "Configuration file syntax test failed."
+                       echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
                fi
        else
                msg_not_running apache
@@ -120,11 +120,6 @@ case "$1" in
   stop)
        stop
        ;;
-  status)
-       status apache
-       RETVAL=$?
-       /usr/sbin/apache -S
-       ;;
   restart)
        restart
        ;;
@@ -147,6 +142,11 @@ case "$1" in
   configtest)
        /usr/sbin/apache -t
        ;;
+  status)
+       status apache
+       RETVAL=$?
+       /usr/sbin/apache -S
+       ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
        exit 3