- tabs in preamble

[packages/apache1.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index 55f0f3eac778e6fb3967776c6b18b90bf2c35ee9..1de6bf058bad2470f2469db938c1fe30bc600249 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -22,7 +22,6 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
                msg_network_down apache
                exit 1
        fi
@@ -34,10 +33,11 @@ if is_no "${IPV6_NETWORKING}"; then
        HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+configtest() {
+       apache -t > /dev/null 2>&1
+}
+
+start() {
        # Check if the service is already running?
        if [ -x /usr/lib/apache1/lingerd ]; then
                if [ ! -f /var/lock/subsys/lingerd ]; then
@@ -57,8 +57,9 @@ case "$1" in
        else
                msg_already_running apache
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/apache ]; then
                msg_stopping apache
@@ -76,6 +77,16 @@ case "$1" in
                        msg_not_running lingerd
                fi
        fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status apache
@@ -86,21 +97,19 @@ case "$1" in
        apache -t > /dev/null 2>&1
        RETVAL=$?
        if [ $RETVAL -eq 0 ]; then
-               $0 stop
-               RETVAL=$((RETVAL + $?))
-               $0 start
-               RETVAL=$((RETVAL + $?))
+               stop
+               start
        else
                fail
                echo "Configuration file syntax test failed."
        fi
 
        ;;
-  reload|force-reload)
+  force-reload)
        if [ -f /var/lock/subsys/apache ]; then
                msg_reloading apache
 
-               apache -t > /dev/null 2>&1
+               configtest
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        killproc apache -HUP
@@ -109,27 +118,42 @@ case "$1" in
                        echo "Configuration file syntax test failed."
                fi
        else
-               msg_not_running apache >&2
+               msg_not_running apache
                RETVAL=7
        fi
        ;;
-  graceful)
+  reload|graceful)
        if [ -f /var/lock/subsys/apache ]; then
                msg_reloading apache
 
-               apache -t > /dev/null 2>&1
+               configtest
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        killproc apache -USR1
                else
                        fail
-                       echo "Configuration file syntax test failed."
+                       echo >&2 "Configuration file syntax test failed."
                fi
        else
-               msg_not_running apache >&2
+               msg_not_running apache
                RETVAL=7
        fi
        ;;
+  flush-logs)
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_reloading apache
+
+               configtest
+               RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       killproc apache -USR1
+                       RETVAL=$?
+               else
+                       fail
+                       echo >&2 "Configuration file syntax test failed."
+               fi
+       fi
+       ;;
   configtest)
        apache -t
        ;;