- tabs in preamble

[packages/apache1.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index db9b8e9d8d67bb4410d1dec939a77cb0be2889c1..1de6bf058bad2470f2469db938c1fe30bc600249 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -17,12 +17,11 @@
 . /etc/sysconfig/network
 
 # Get service config
-[ -f /etc/sysconfig/apache1 ] && . /etc/sysconfig/apache1
+[ -f /etc/sysconfig/apache ] && . /etc/sysconfig/apache
 
 # 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,21 +33,33 @@ 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
+                       msg_starting lingerd
+                       SERVICE_UMASK=002 daemon --user http /usr/lib/apache1/lingerd
+                       RETVAL=$?
+                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lingerd
+               else
+                       msg_already_running lingerd
+               fi
+       fi
        if [ ! -f /var/lock/subsys/apache ]; then
                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
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/apache ]; then
                msg_stopping apache
@@ -57,6 +68,25 @@ case "$1" in
        else
                msg_not_running apache
        fi
+       if [ -x /usr/lib/apache1/lingerd ]; then
+               if [ -f /var/lock/subsys/lingerd ]; then
+                       msg_stopping lingerd
+                       /usr/lib/apache1/lingerd -k && ok || fail
+                       rm -f /var/lock/subsys/lingerd >/dev/null 2>&1
+               else
+                       msg_not_running lingerd
+               fi
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status apache
@@ -64,32 +94,71 @@ 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
+               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
-               killproc apache -HUP
+
+               configtest
                RETVAL=$?
+               if [ $RETVAL -eq 0 ]; then
+                       killproc apache -HUP
+               else
+                       fail
+                       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
-               killproc apache -USR1
+
+               configtest
                RETVAL=$?
-        else
-               msg_not_running apache >&2
+               if [ $RETVAL -eq 0 ]; then
+                       killproc apache -USR1
+               else
+                       fail
+                       echo >&2 "Configuration file syntax test failed."
+               fi
+       else
+               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
+       ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|configtest|status}"
        exit 3
        ;;
 esac