- whitespace cleanup

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index f54568962c14bfd4baf449ea9ac645afd5d08904..a803710c2e3bd1c65dcad5f03162ee304ab8cd62 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -39,7 +39,7 @@ elif [ -n "$HTTPD_CONF" ]; then
        echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
        exit 1
 else
-       CFG=""
+       CFG=""
 fi
 
 RETVAL=0
@@ -76,13 +76,19 @@ case "$1" in
        /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
        ;;
   restart)
-       $0 stop
+       $0 stop
        $0 start
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
                msg_reloading httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} $CFG -k graceful
+               httpd.${HTTPD_MPM} $CFG -t > /dev/null 2>&1
+               if [ $? -eq 0 ]; then
+                   daemon httpd.${HTTPD_MPM} $CFG -k graceful
+               else
+                   fail
+                   echo "Configuration file syntax test failed."
+               fi
                RETVAL=$?
        else
                msg_not_running httpd.${HTTPD_MPM} >&2