X-Git-Url: https://git.tld-linux.org/?p=packages%2Fapache.git;a=blobdiff_plain;f=apache.init;h=00dd2f4e0c622b086118f08298ba74cba30cbfcb;hp=692c2375734ae6ab3857d77023f611a3f821b6d2;hb=68340a8134645ea798c282b21ccf8e3e15c2cf6d;hpb=03fa0e1eac0d3851c5ae1ab08a02cc3a5ee4eb69

diff --git a/apache.init b/apache.init
index 692c237..00dd2f4 100755
--- 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 $?
 }
 
@@ -86,7 +85,7 @@ start() {
 	# 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.${HTTPD_MPM} $CFG $HTTPD_OPTS
+	daemon --pidfile /var/run/httpd.pid /usr/sbin/httpd $CFG $HTTPD_OPTS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
 }
@@ -99,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
 }
 
@@ -114,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
 }
@@ -128,6 +127,7 @@ condrestart() {
 
 	checkconfig
 	stop
+	[ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
 	start
 }
 
@@ -143,6 +143,7 @@ case "$1" in
   restart)
 	checkconfig
 	stop
+	[ "$RESTART_DELAY" ] && usleep $RESTART_DELAY
 	start 0
 	;;
   try-restart)
@@ -155,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}"