- tabs

Changed files:
    apache.init -> 1.39
    apache1.init -> 1.14

diff --git a/apache.init b/apache.init
index b3620ecc98d531e352a2e43f48d3628bb20380b5..891545be5af3af94f40fb5a796953583e81229ba 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"
@@ -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

diff --git a/apache1.init b/apache1.init
index d677835df0c8a6c8eb0779646df2cd5cc1b3eed9..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
@@ -77,8 +77,8 @@ case "$1" in
                if [ $RETVAL -eq 0 ]; then
                        killproc apache -HUP
                else
-                   fail
-                   echo "Configuration file syntax test failed."
+                       fail
+                       echo "Configuration file syntax test failed."
                fi
        else
                msg_not_running apache >&2
@@ -94,8 +94,8 @@ case "$1" in
                if [ $RETVAL -eq 0 ]; then
                        killproc apache -USR1
                else
-                   fail
-                   echo "Configuration file syntax test failed."
+                       fail
+                       echo "Configuration file syntax test failed."
                fi
        else
                msg_not_running apache >&2