- support for multiple MPMs

Changed files:
    apache.init -> 1.23
    apache.sysconfig -> 1.3

diff --git a/apache.init b/apache.init
index e2448a60f8d5f64e9400fb6d10cf8314cd815ef3..0b932615e2bc6345dad8dc7f4cd9ebdb9df52010 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -32,34 +32,36 @@ else
        exit 0
 fi
 
+[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
+
 RETVAL=0
 # See how we were called.
 case "$1" in
   start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
-               msg_starting httpd
-               daemon httpd $HTTPD_OPTS
+               msg_starting httpd.${HTTPD_MPM}
+               daemon httpd.${HTTPD_MPM} $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_already_running httpd
+               msg_already_running httpd.${HTTPD_MPM}
        fi
        ;;
   stop)
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_stopping httpd
-               daemon httpd -k stop
+               msg_stopping httpd.${HTTPD_MPM}
+               daemon httpd.${HTTPD_MPM} -k stop
                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
-               msg_not_running httpd
+               msg_not_running httpd.${HTTPD_MPM}
        fi
        ;;
   status)
-       status httpd
+       status httpd.${HTTPD_MPM}
        RETVAL=$?
-       /usr/sbin/httpd -S
+       /usr/sbin/httpd.${HTTPD_MPM} -S
        ;;
   restart)
        $0 stop
@@ -67,11 +69,11 @@ case "$1" in
        ;;
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd
-               daemon httpd -k graceful
+               msg_reloading httpd.${HTTPD_MPM}
+               daemon httpd.${HTTPD_MPM} -k graceful
                RETVAL=$?
        else
-               msg_not_running httpd >&2
+               msg_not_running httpd.${HTTPD_MPM} >&2
                RETVAL=7
        fi
        ;;

diff --git a/apache.sysconfig b/apache.sysconfig
index 78aeb7799bdea65dda94544e5a8bd56692a840db..dd164c4de065a6f342a7dda7a67ae87ed4f4c105 100644 (file)
--- a/apache.sysconfig
+++ b/apache.sysconfig
@@ -6,3 +6,7 @@ SERVICE_RUN_NICE_LEVEL="+5"
 # Cmdline options 
 HTTPD_OPTS=""
 
+# choose MPM
+# prefork, worker, perchild (experimental), metuxmpm (experimental)
+# (note that some may be not available)
+HTTPD_MPM="prefork"