| 1 |
commit: 0c73aa70400171c0ca352792e8e73e1015af13f3 |
| 2 |
Author: Peter Volkov <pva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 15 08:55:55 2011 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 15 08:55:55 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=0c73aa70 |
| 7 |
|
| 8 |
Use start-stop-daemon to use system limits for apache. Fixes bug #347301 by Diego Elio Pettenò. |
| 9 |
|
| 10 |
--- |
| 11 |
2.2/init/apache2.initd | 4 ++-- |
| 12 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd |
| 15 |
index df7374e..66f1c73 100755 |
| 16 |
--- a/2.2/init/apache2.initd |
| 17 |
+++ b/2.2/init/apache2.initd |
| 18 |
@@ -69,7 +69,7 @@ start() { |
| 19 |
[ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache |
| 20 |
|
| 21 |
ebegin "Starting ${SVCNAME}" |
| 22 |
- ${APACHE2} ${APACHE2_OPTS} -k start |
| 23 |
+ start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start |
| 24 |
|
| 25 |
i=0 |
| 26 |
while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do |
| 27 |
@@ -84,7 +84,7 @@ stop() { |
| 28 |
checkconfd || return 1 |
| 29 |
|
| 30 |
ebegin "Stopping ${SVCNAME}" |
| 31 |
- ${APACHE2} ${APACHE2_OPTS} -k stop |
| 32 |
+ start-stop-daemon --stop --pidfile ${PIDFILE} -- ${APACHE2} ${APACHE2_OPTS} -k stop |
| 33 |
|
| 34 |
i=0 |
| 35 |
while pidof "${APACHE2}" >/dev/null && [ $i -lt ${TIMEOUT} ]; do |
Archives