diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-10-25 14:37:04 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-10-25 14:37:04 +0000 |
| commit | 927da206324e99b696ffdebe653d99651a68bc34 (patch) | |
| tree | ef9ecf26fdc99fe3da40aaf6d39c5992751125b8 | |
| parent | add patch for CVE-2008-2939 (diff) | |
| download | apache-927da206324e99b696ffdebe653d99651a68bc34.tar.gz apache-927da206324e99b696ffdebe653d99651a68bc34.tar.bz2 apache-927da206324e99b696ffdebe653d99651a68bc34.zip | |
fix #233150
| -rwxr-xr-x | 2.2/init/apache2.initd | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index bde42c0..5c6f959 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -11,7 +11,7 @@ depend() { } configtest() { - ebegin "Checking Apache Configuration" + ebegin "Checking ${SVCNAME} configuration" checkconfig eend $? } @@ -46,7 +46,7 @@ checkconfig() { ${APACHE2} ${APACHE2_OPTS} -t 1>/dev/null 2>&1 ret=$? if [ $ret -ne 0 ]; then - eerror "Apache2 has detected a syntax error in your configuration files:" + eerror "${SVCNAME} has detected a syntax error in your configuration files:" ${APACHE2} ${APACHE2_OPTS} -t fi @@ -58,7 +58,7 @@ start() { [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache - ebegin "Starting apache2" + ebegin "Starting ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k start let i=0 @@ -73,7 +73,7 @@ start() { stop() { checkconfd || return 1 - ebegin "Stopping apache2" + ebegin "Stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k stop let i=0 @@ -92,22 +92,22 @@ reload() { service_started "${SVCNAME}" || return if [ "${RELOAD_TYPE}" = "restart" ]; then - ebegin "Restarting apache2" + ebegin "Restarting ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k restart eend $? elif [ "${RELOAD_TYPE}" = "graceful" ]; then - ebegin "Gracefully restarting apache2" + ebegin "Gracefully restarting ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k graceful eend $? else - eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/apache2" + eerror "${RELOAD_TYPE} is not a valid RELOAD_TYPE. Please edit /etc/conf.d/${SVCNAME}" fi } graceful() { checkconfig || return 1 service_started "${SVCNAME}" || return - ebegin "Gracefully restarting apache2" + ebegin "Gracefully restarting ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k graceful eend $? } @@ -120,7 +120,7 @@ gracefulstop() { mark_service_stopped "${SVCNAME}" fi - ebegin "Gracefully stopping apache2" + ebegin "Gracefully stopping ${SVCNAME}" ${APACHE2} ${APACHE2_OPTS} -k graceful-stop eend $? } |