- updated to 2.4.48

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 2a600bbb219e0da26de4e9c3451c86502a03ff0a..00dd2f4e0c622b086118f08298ba74cba30cbfcb 100755 (executable)
--- a/apache.init
+++ b/apache.init
@@ -21,14 +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
 
-SVC_NAME="Apache 2.2 Web Server"
+SVC_NAME="Apache 2.4 Web Server"
 
 if [ -n "${HTTPD_CONF}" ]; then
        if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
@@ -127,6 +127,7 @@ condrestart() {
 
        checkconfig
        stop
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
        start
 }
 
@@ -142,6 +143,7 @@ case "$1" in
   restart)
        checkconfig
        stop
+       [ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
        start 0
        ;;
   try-restart)