- release 4

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index e067c46e34cb07d8bbadb17e308f2cd38b9dd56b..169ec3fa49579130193d4359e94e05cc1ac84a61 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -39,21 +39,24 @@ if [ -n "${HTTPD_CONF}" ]; then
        fi
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
+configtest() {
+       /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS >/dev/null 2>&1
+       RETVAL=$?
+}
+
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
                msg_starting httpd.${HTTPD_MPM}
-               daemon httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
+               daemon /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
                msg_already_running httpd.${HTTPD_MPM}
        fi
-       ;;
-  stop)
+}
+
+stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
                msg_stopping httpd.${HTTPD_MPM}
@@ -62,48 +65,74 @@ case "$1" in
        else
                msg_not_running httpd.${HTTPD_MPM}
        fi
+}
+
+condrestart() {
+       if [ -f /var/lock/subsys/httpd ]; then
+               stop
+               start
+       else
+               msg_not_running httpd.${HTTPD_MPM}
+               RETVAL=$1
+       fi
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
+       /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -S
        ;;
   restart)
-       $0 stop
-       $0 start
+       stop
+       start
+       ;;
+  try-restart)
+       condrestart 0
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
-               RETVAL=$?
+               configtest
                if [ $RETVAL -eq 0 ]; then
                        msg_reloading httpd.${HTTPD_MPM}
-                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       busy
+                       /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -k graceful
                        RETVAL=$?
+                       [ $RETVAL -eq 0 ] && ok || fail
                fi
        else
-               msg_not_running httpd.${HTTPD_MPM} >&2
+               msg_not_running httpd.${HTTPD_MPM}
                RETVAL=7
        fi
        ;;
-  force-reload)
+  flush-logs)
        if [ -f /var/lock/subsys/httpd ]; then
-               run_cmd "Checking httpd.${HTTPD_MPM} configuration" httpd.${HTTPD_MPM} $CFG -t
-               RETVAL=$?
+               msg_reloading httpd.${HTTPD_MPM}
+
+               configtest
                if [ $RETVAL -eq 0 ]; then
-                       msg_reloading httpd.${HTTPD_MPM}
-                       # forced reload
-                       daemon httpd.${HTTPD_MPM} $CFG -k restart
+                       /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
                        RETVAL=$?
+                       [ $RETVAL -eq 0 ] && ok || fail
+               else
+                       fail
+                       echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
                fi
-       else
-               msg_not_running httpd.${HTTPD_MPM} >&2
-               RETVAL=7
        fi
        ;;
-
+  configtest)
+       /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS
+       ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|force-reload|graceful|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
        exit 3
        ;;
 esac