- check config before doing apache restart

Changed files:
    apache1.init -> 1.16

diff --git a/apache1.init b/apache1.init
index 187ce2222a18954f4816e37d51142f85fa86f8f6..060e0a9441c87431e99f4443b158e152b1fe9111 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -64,9 +64,18 @@ case "$1" in
        /usr/sbin/apache -S
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       apache -t > /dev/null 2>&1
+       RETVAL=$?
+       if [ $RETVAL -eq 0 ]; then
+               $0 stop
+               RETVAL=$((RETVAL + $?))
+               $0 start
+               RETVAL=$((RETVAL + $?))
+       else
+               fail
+               echo "Configuration file syntax test failed."
+       fi
+
        ;;
   reload|force-reload)
        if [ -f /var/lock/subsys/apache ]; then