- release 6

[packages/apache1.git] / apache1.init

diff --git a/apache1.init b/apache1.init
index 8edad64d1810bdfb956355e89d876dbdcb2866a5..e050eb2835a7eaaba3c615b2f5381896a1a545a1 100644 (file)
--- a/apache1.init
+++ b/apache1.init
@@ -22,8 +22,7 @@
 # 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
+               msg_network_down "Apache 1.3 Web Server"
                exit 1
        fi
 else
@@ -34,62 +33,147 @@ if is_no "${IPV6_NETWORKING}"; then
        HTTPD_OPTS="$HTTPD_OPTS -4"
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/apache ]; then
-               msg_starting apache
-               daemon apache $HTTPD_OPTS
+configtest() {
+       /usr/sbin/apache -t
+}
+
+# wrapper for configtest
+checkconfig() {
+       local details=${1:-0}
+
+       if [ $details = 1 ]; then
+               # run config test and display report (status action)
+               show "Checking %s configuration" "Apache 1.3 Web Server"; busy
+               local out
+               out=`configtest 2>&1`
                RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+               fi
+               [ "$out" ] && echo >&2 "$out"
        else
-               msg_already_running apache
+               # run config test and abort with nice message if failed
+               # (for actions checking status before action).
+               configtest >/dev/null 2>&1
+               RETVAL=$?
+               if [ $RETVAL != 0 ]; then
+                       show "Checking %s configuration" "Apache 1.3 Web Server"; fail
+                       nls 'Configuration test failed. See details with %s "checkconfig"' $0
+                       exit $RETVAL
+               fi
        fi
-       ;;
-  stop)
+}
+
+start() {
+       # Check if the service is already running?
+       if [ -x /usr/lib/apache1/lingerd ]; then
+               if [ ! -f /var/lock/subsys/lingerd ]; then
+                       msg_starting "Apache Lingerd"
+                       SERVICE_UMASK=002 daemon --user http /usr/lib/apache1/lingerd
+                       RETVAL=$?
+                       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lingerd
+               else
+                       msg_already_running "Apache Lingerd"
+               fi
+       fi
+
+       if [ -f /var/lock/subsys/apache ]; then
+               msg_already_running "Apache 1.3 Web Server"
+               return
+       fi
+
+       checkconfig
+       msg_starting "Apache 1.3 Web Server"
+       daemon /usr/sbin/apache $HTTPD_OPTS
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/apache ]; then
-               msg_stopping apache
-               killproc apache
-               rm -f /var/lock/subsys/apache /var/run/.pid /var/run/apache.loc* >/dev/null 2>&1
+               msg_stopping "Apache 1.3 Web Server"
+               killproc --pidfile /var/run/apache.pid apache
+               rm -f /var/lock/subsys/apache /var/run/apache.pid /var/run/apache.loc* >/dev/null 2>&1
        else
-               msg_not_running apache
+               msg_not_running "Apache 1.3 Web Server"
        fi
-       ;;
-  status)
-       status apache
+       if [ -x /usr/lib/apache1/lingerd ]; then
+               if [ -f /var/lock/subsys/lingerd ]; then
+                       msg_stopping "Apache Lingerd"
+                       /usr/lib/apache1/lingerd -k && ok || fail
+                       rm -f /var/lock/subsys/lingerd >/dev/null 2>&1
+               else
+                       msg_not_running "Apache Lingerd"
+               fi
+       fi
+}
+
+reload() {
+       local sig=${1:-HUP}
+       local retnr=${2:-7}
+       if [ ! -f /var/lock/subsys/apache ]; then
+               msg_not_running "Apache 1.3 Web Server"
+               RETVAL=$retnr
+               return
+       fi
+
+       checkconfig
+       msg_reloading "Apache 1.3 Web Server"
+       killproc --pidfile /var/run/apache.pid apache -$sig
        RETVAL=$?
-       /usr/sbin/apache -S
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/apache ]; then
+               msg_not_running "Apache 1.3 Web Server"
+               RETVAL=$1
+               return
+       fi
+
+       checkconfig
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   restart)
-       $0 stop
-       $0 start
-       exit $?
+       checkconfig
+       stop
+       start
        ;;
-  reload|force-reload)
-       if [ -f /var/lock/subsys/apache ]; then
-               msg_reloading apache
-               killproc apache -HUP
-               RETVAL=$?
-       else
-               msg_not_running apache >&2
-               RETVAL=7
-       fi
+  try-restart)
+       condrestart 0
        ;;
-  graceful)
-       if [ -f /var/lock/subsys/apache ]; then
-               msg_reloading apache
-               killproc apache -USR1
-               RETVAL=$?
-        else
-               msg_not_running apache >&2
-               RETVAL=7
-       fi
+  reload|graceful)
+       reload USR1 7
+       ;;
+  force-reload)
+       reload HUP 7
+       ;;
+  flush-logs)
+       reload USR1 0
+       ;;
+  checkconfig|configtest)
+       checkconfig 1
+       ;;
+  status)
+       status apache
+       RETVAL=$?
+       /usr/sbin/apache -S
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|graceful|force-reload|checkconfig|status}"
        exit 3
        ;;
 esac