diff options
| author |   Christian Heim <phreak@gentoo.org> | 2007-04-18 11:11:19 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2007-04-18 11:11:19 +0000 |
| commit | f183d761a871383fa6a78e8028ec65e6af9a2494 (patch) | |
| tree | 501e5cf1990e9e6966303496f9d72577a9f26024 /2.2 | |
| parent | The external pcre patch causes some nasty double free/oops w/ the 2.0 branch. (diff) | |
| download | apache-f183d761a871383fa6a78e8028ec65e6af9a2494.tar.gz apache-f183d761a871383fa6a78e8028ec65e6af9a2494.tar.bz2 apache-f183d761a871383fa6a78e8028ec65e6af9a2494.zip | |
Fixing the apache2 initscript wrt #174348 thanks to Pierre Guinoiseau <geekounet at gmail.com> and Roy Marples.
Diffstat (limited to '2.2')
| -rwxr-xr-x | 2.2/init/apache2.initd | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 6302327..c366648 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -54,7 +54,7 @@ checkconfig() { fi CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}" - [ ${CONFIGFILE:0:1} != "/" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}" + [ "${CONFIGFILE#/}" = "${CONFIGFILE}" ] && CONFIGFILE="${SERVERROOT}/${CONFIGFILE}" if [ ! -r "${CONFIGFILE}" ]; then eerror "Unable to read configuration file: ${CONFIGFILE}" return 1 @@ -86,14 +86,14 @@ start() { [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache # TODO kill the environment crap... see note above - clear_env_except "${KEEPENV}" /sbin/start-stop-daemon --start --exec ${APACHE2} --pidfile /var/run/apache2.pid -- ${APACHE2_OPTS} -k start + clear_env_except "${KEEPENV}" start-stop-daemon --start --exec ${APACHE2} --pidfile /var/run/apache2.pid -- ${APACHE2_OPTS} -k start eend $? } stop() { checkconfig || return 1 ebegin "Stopping apache2" - /sbin/start-stop-daemon --stop --retry -TERM/5/-KILL/5 --exec ${APACHE2} --pidfile /var/run/apache2.pid + start-stop-daemon --stop --retry -TERM/5/-KILL/5 --exec ${APACHE2} --pidfile /var/run/apache2.pid eend $? } @@ -102,13 +102,13 @@ reload() { RELOAD_TYPE="${RELOAD_TYPE:-graceful}" checkconfig || return 1 - if [ "${RELOAD_TYPE}" == "restart" ]; then + if [ "${RELOAD_TYPE}" = "restart" ]; then ebegin "Restarting apache2" - /sbin/start-stop-daemon --stop --signal HUP --exec ${APACHE2} --pidfile /var/run/apache2.pid + start-stop-daemon --stop --oknodo --signal HUP --exec ${APACHE2} --pidfile /var/run/apache2.pid eend $? - elif [ "${RELOAD_TYPE}" == "graceful" ]; then + elif [ "${RELOAD_TYPE}" = "graceful" ]; then ebegin "Gracefully restarting apache2" - /sbin/start-stop-daemon --stop --signal USR1 --exec ${APACHE2} --pidfile /var/run/apache2.pid + start-stop-daemon --stop --oknodo --signal USR1 --exec ${APACHE2} --pidfile /var/run/apache2.pid eend $? else eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/apache2" @@ -118,7 +118,7 @@ reload() { graceful() { checkconfig || return 1 ebegin "Gracefully restarting apache2" - /sbin/start-stop-daemon --stop --signal USR1 --exec ${APACHE2} --pidfile /var/run/apache2.pid + start-stop-daemon --stop --signal USR1 --exec ${APACHE2} --pidfile /var/run/apache2.pid eend $? } @@ -132,7 +132,7 @@ gracefulstop() { ebegin "Gracefully stopping apache2" # 28 is SIGWINCH - /sbin/start-stop-daemon --stop --signal 28 --exec ${APACHE2} --pidfile /var/run/apache2.pid + start-stop-daemon --stop --signal 28 --exec ${APACHE2} --pidfile /var/run/apache2.pid eend $? } @@ -149,5 +149,3 @@ fullstatus() { ${LYNX} ${STATUSURL} } - - |