summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2011-09-15 08:55:55 +0000
committerPeter Volkov <pva@gentoo.org>2011-09-15 08:55:55 +0000
commit0c73aa70400171c0ca352792e8e73e1015af13f3 (patch)
tree55036333d97af1f424e1f947a2289370869959e7
parentPrepare 2.2.20: update init script to respect return status of stop, bug #357... (diff)
downloadapache-0c73aa70400171c0ca352792e8e73e1015af13f3.tar.gz
apache-0c73aa70400171c0ca352792e8e73e1015af13f3.tar.bz2
apache-0c73aa70400171c0ca352792e8e73e1015af13f3.zip
Use start-stop-daemon to use system limits for apache. Fixes bug #347301 by Diego Elio PettenĂ².
-rwxr-xr-x2.2/init/apache2.initd4
1 files changed, 2 insertions, 2 deletions
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd
index df7374e..66f1c73 100755
--- a/2.2/init/apache2.initd
+++ b/2.2/init/apache2.initd
@@ -69,7 +69,7 @@ start() {
[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache
ebegin "Starting ${SVCNAME}"
- ${APACHE2} ${APACHE2_OPTS} -k start
+ start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start
i=0
while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do
@@ -84,7 +84,7 @@ stop() {
checkconfd || return 1
ebegin "Stopping ${SVCNAME}"
- ${APACHE2} ${APACHE2_OPTS} -k stop
+ start-stop-daemon --stop --pidfile ${PIDFILE} -- ${APACHE2} ${APACHE2_OPTS} -k stop
i=0
while pidof "${APACHE2}" >/dev/null && [ $i -lt ${TIMEOUT} ]; do