add RESTART_DELAY parameter to sleep between stop and start

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
old mode 100644 (file)
new mode 100755 (executable)
index 5960a47..00dd2f4
--- a/apache.init
+++ b/apache.init
@@ -21,15 +21,14 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down "Apache 2.2 Web Server"
+               msg_network_down "Apache 2.4 Web Server"
                exit 1
        fi
 else
        exit 0
 fi
 
-[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
-SVC_NAME="Apache 2.2 Web Server ($HTTPD_MPM)"
+SVC_NAME="Apache 2.4 Web Server"
 
 if [ -n "${HTTPD_CONF}" ]; then
        if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
@@ -42,7 +41,7 @@ fi
 
 # configtest itself
 configtest() {
-       /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS 2>&1
+       /usr/sbin/httpd -t $CFG $HTTPD_OPTS 2>&1
        return $?
 }
 
@@ -81,9 +80,12 @@ start() {
                return
        fi
 
-       checkconfig
+       [ "$1" -eq 0 ] || checkconfig
        msg_starting "$SVC_NAME"
-       daemon --pidfile /var/run/httpd.pid /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
+       # remove ssl_scache on startup, otherwise httpd may go into
+       # infinite loop if there are db transaction logs laying around
+       rm -f /var/cache/httpd/*ssl_scache*
+       daemon --pidfile /var/run/httpd.pid /usr/sbin/httpd $CFG $HTTPD_OPTS
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
 }
@@ -96,7 +98,7 @@ stop() {
        fi
 
        msg_stopping "$SVC_NAME"
-       killproc --pidfile /var/run/httpd.pid httpd.${HTTPD_MPM}
+       killproc --pidfile /var/run/httpd.pid httpd
        rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
 }
 
@@ -111,7 +113,7 @@ reload() {
        checkconfig
        msg_reloading "$SVC_NAME"
        busy
-       /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -k graceful
+       /usr/sbin/httpd $CFG $HTTPD_OPTS -k graceful
        RETVAL=$?
        [ $RETVAL -eq 0 ] && ok || fail
 }
@@ -125,6 +127,7 @@ condrestart() {
 
        checkconfig
        stop
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
        start
 }
 
@@ -140,7 +143,8 @@ case "$1" in
   restart)
        checkconfig
        stop
-       start
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
+       start 0
        ;;
   try-restart)
        condrestart 0
@@ -152,9 +156,9 @@ case "$1" in
        checkconfig 1
        ;;
   status)
-       status httpd.${HTTPD_MPM}
+       status httpd
        RETVAL=$?
-       /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -S
+       /usr/sbin/httpd $CFG $HTTPD_OPTS -S
        ;;
   *)
        msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|graceful|configtest|status}"