- ankry: LSB says "stop" must always return 0. As it must not fail.

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index b3620ecc98d531e352a2e43f48d3628bb20380b5..439445c29ed0df6c71806b4c5076c1804ddb99a5 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -33,7 +33,7 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-if   [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
+if [ -d "${HTTPD_CONF:-'/etc/httpd/httpd.conf'}" ]; then
        CFG="-f ${HTTPD_CONF:-'/etc/httpd/httpd.conf'}"
 elif [ -n "$HTTPD_CONF" ]; then
        echo "error: HTTPD_CONF='$HTTPD_CONF': not a file, not a directory"
@@ -61,9 +61,9 @@ case "$1" in
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
                daemon --waitforname httpd.${HTTPD_MPM} --waitfortime 60 httpd.${HTTPD_MPM} $CFG -k stop
-               RETVAL=$?
+               RET=$?
                # Delete pidfile only when apache was called successfully
-               if [ $RETVAL -eq 0 ]; then
+               if [ $RET -eq 0 ]; then
                        rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
                fi
        else
@@ -85,10 +85,10 @@ case "$1" in
                httpd.${HTTPD_MPM} $CFG -t > /dev/null 2>&1
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
-                   daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
                else
-                   fail
-                   echo "Configuration file syntax test failed."
+                       fail
+                       echo "Configuration file syntax test failed."
                fi
        else
                msg_not_running httpd.${HTTPD_MPM} >&2