Author: adamg Date: Sat Feb 25 21:32:39 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- one httpd to rule them all
---- Files affected:
packages/apache:
apache.init (1.70 -> 1.71)
---- Diffs:
================================================================
Index: packages/apache/apache.init
diff -u packages/apache/apache.init:1.70 packages/apache/apache.init:1.71
--- packages/apache/apache.init:1.70 Sun Aug 21 12:58:50 2011
+++ packages/apache/apache.init Sat Feb 25 22:32:34 2012
@@ -28,8 +28,7 @@
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 @@
# 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 @@
# 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 @@
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 @@
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 @@
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}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.init?r1=1.70&r2=1.71&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
