[gentoo-commits] proj/apache:master commit in: 2.2/init/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     0c73aa70400171c0ca352792e8e73e1015af13f3
Author:     Peter Volkov <pva <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 08:55:55 2011 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 08:55:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=0c73aa70

Use start-stop-daemon to use system limits for apache. Fixes bug #347301 by Diego Elio Pettenò.

---
 2.2/init/apache2.initd | 4 ++--
 1 file 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