From: Bartosz Świątek Date: Thu, 23 Feb 2012 13:12:02 +0000 (+0100) Subject: - no need to set MPM there X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=46200aff246dafeab07e65c8e07cd3c818af89e4;p=packages%2Fapache.git - no need to set MPM there --- diff --git a/apache.init b/apache.init index 692c237..2a600bb 100755 --- a/apache.init +++ b/apache.init @@ -28,8 +28,7 @@ else exit 0 fi -[ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork" -SVC_NAME="Apache 2.2 Web Server ($HTTPD_MPM)" +SVC_NAME="Apache 2.2 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 } @@ -155,9 +154,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}" diff --git a/apache.sysconfig b/apache.sysconfig index 7dd72ed..b582298 100644 --- a/apache.sysconfig +++ b/apache.sysconfig @@ -11,11 +11,6 @@ SERVICE_RUN_NICE_LEVEL="+5" # -T avoid doing many unneded DocumentRoot checks HTTPD_OPTS="" -# choose MPM -# prefork, worker, perchild (experimental), metuxmpm (experimental) -# (note that some may be not available) -HTTPD_MPM="prefork" - # perhaps set 128MB memory limit #SERVICE_LIMITS="$DEFAULT_SERVICE_LIMITS -m 128000"