- release 4

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 763a0320714287720f9910a940732938a8b334b3..169ec3fa49579130193d4359e94e05cc1ac84a61 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -39,11 +39,16 @@ if [ -n "${HTTPD_CONF}" ]; then
        fi
 fi
 
+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
@@ -84,7 +89,7 @@ case "$1" in
   status)
        status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd.${HTTPD_MPM} $CFG -S
+       /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -S
        ;;
   restart)
        stop
@@ -95,12 +100,13 @@ case "$1" in
        ;;
   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}
@@ -111,19 +117,22 @@ case "$1" in
        if [ -f /var/lock/subsys/httpd ]; then
                msg_reloading httpd.${HTTPD_MPM}
 
-               httpd.${HTTPD_MPM} -t >/dev/null 2>&1
-               RETVAL=$?
+               configtest
                if [ $RETVAL -eq 0 ]; then
-                       daemon httpd.${HTTPD_MPM} $CFG -k graceful
+                       /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
                        RETVAL=$?
+                       [ $RETVAL -eq 0 ] && ok || fail
                else
                        fail
-                       echo >&2 "Configuration file syntax test failed."
+                       echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
                fi
        fi
        ;;
+  configtest)
+       /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS
+       ;;
   *)
-       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|status}"
+       msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"
        exit 3
        ;;
 esac