- use nice service names

[packages/apache.git] / apache.init

diff --git a/apache.init b/apache.init
index 80cd971282b747065058b06678d1bdbb525c8848..c6f40f9e5702969c613a708f38c36c74482bf6fa 100644 (file)
--- a/apache.init
+++ b/apache.init
@@ -21,7 +21,7 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
        if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
-               msg_network_down httpd
+               msg_network_down "Apache 2.2 Web Server"
                exit 1
        fi
 else
@@ -29,6 +29,7 @@ else
 fi
 
 [ -z "$HTTPD_MPM" ] && HTTPD_MPM="prefork"
+SVC_NAME="Apache 2.2 Web Server ($HTTPD_MPM)"
 
 if [ -n "${HTTPD_CONF}" ]; then
        if [ -d "${HTTPD_CONF}" ] || [ -f "${HTTPD_CONF}" ]; then
@@ -41,28 +42,29 @@ fi
 
 configtest() {
        /usr/sbin/httpd.${HTTPD_MPM} -t $CFG $HTTPD_OPTS >/dev/null 2>&1
+       RETVAL=$?
 }
 
 start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/httpd ]; then
-               msg_starting httpd.${HTTPD_MPM}
+               msg_starting "$SVC_NAME"
                daemon /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/httpd
        else
-               msg_already_running httpd.${HTTPD_MPM}
+               msg_already_running "$SVC_NAME"
        fi
 }
 
 stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_stopping httpd.${HTTPD_MPM}
+               msg_stopping "$SVC_NAME"
                killproc --pidfile httpd.pid httpd.${HTTPD_MPM}
                rm -f /var/lock/subsys/httpd /var/run/httpd.pid /var/run/httpd.loc* >/dev/null 2>&1
        else
-               msg_not_running httpd.${HTTPD_MPM}
+               msg_not_running "$SVC_NAME"
        fi
 }
 
@@ -71,7 +73,7 @@ condrestart() {
                stop
                start
        else
-               msg_not_running httpd.${HTTPD_MPM}
+               msg_not_running "$SVC_NAME"
                RETVAL=$1
        fi
 }
@@ -100,32 +102,30 @@ case "$1" in
   reload|force-reload|graceful)
        if [ -f /var/lock/subsys/httpd ]; then
                configtest
-               RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
-                       msg_reloading httpd.${HTTPD_MPM}
+                       msg_reloading "$SVC_NAME"
                        busy
                        /usr/sbin/httpd.${HTTPD_MPM} $CFG $HTTPD_OPTS -k graceful
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && ok || fail
                fi
        else
-               msg_not_running httpd.${HTTPD_MPM}
+               msg_not_running "$SVC_NAME"
                RETVAL=7
        fi
        ;;
   flush-logs)
        if [ -f /var/lock/subsys/httpd ]; then
-               msg_reloading httpd.${HTTPD_MPM}
+               msg_reloading "$SVC_NAME"
 
                configtest
-               RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        /usr/sbin/httpd.${HTTPD_MPM} $CFG -k graceful
                        RETVAL=$?
                        [ $RETVAL -eq 0 ] && ok || fail
                else
                        fail
-                       echo >&2 "Configuration file syntax test failed."
+                       echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
                fi
        fi
        ;;