- one more error catch

[packages/apache.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index db9b8e9d8d67bb4410d1dec939a77cb0be2889c1..474e8754973f1a57d7d48e1fe923e5e1eb653e36 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -43,7 +43,7 @@ case "$1" in
                msg_starting apache
                daemon apache $HTTPD_OPTS
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
        else
                msg_already_running apache
        fi
@@ -71,8 +71,15 @@ case "$1" in
   reload|force-reload)
        if [ -f /var/lock/subsys/apache ]; then
                msg_reloading apache
-               killproc apache -HUP
+
+               apache -t > /dev/null 2>&1
                RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       killproc apache -HUP
+               else
+                       fail
+                       echo "Configuration file syntax test failed."
+               fi
        else
                msg_not_running apache >&2
                RETVAL=7
@@ -81,9 +88,16 @@ case "$1" in
   graceful)
        if [ -f /var/lock/subsys/apache ]; then
                msg_reloading apache
-               killproc apache -USR1
+
+               apache -t > /dev/null 2>&1
                RETVAL=$?
-        else
+               if [ $RETVAL -eq 0 ]; then
+                       killproc apache -USR1
+               else
+                       fail
+                       echo "Configuration file syntax test failed."
+               fi
+       else
                msg_not_running apache >&2
                RETVAL=7
        fi