From 9841efdf354f349a2445b74feca67967dc9db6dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Mon, 8 Dec 2008 10:19:56 +0000
Subject: [PATCH] - use nice service names

Changed files:
    apache.init -> 1.63
    apache1.init -> 1.30
---
 apache.init  | 19 ++++++++++---------
 apache1.init | 24 ++++++++++++------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/apache.init b/apache.init
index 169ec3f..c6f40f9 100644
--- 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
@@ -47,23 +48,23 @@ configtest() {
 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
 }
 
@@ -72,7 +73,7 @@ condrestart() {
 		stop
 		start
 	else
-		msg_not_running httpd.${HTTPD_MPM}
+		msg_not_running "$SVC_NAME"
 		RETVAL=$1
 	fi
 }
@@ -102,20 +103,20 @@ case "$1" in
 	if [ -f /var/lock/subsys/httpd ]; then
 		configtest
 		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
 		if [ $RETVAL -eq 0 ]; then
diff --git a/apache1.init b/apache1.init
index 5503f20..8fda4d0 100644
--- a/apache1.init
+++ b/apache1.init
@@ -22,7 +22,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 apache
+		msg_network_down "Apache 1.3 Web Server"
 		exit 1
 	fi
 else
@@ -42,40 +42,40 @@ start() {
 	# Check if the service is already running?
 	if [ -x /usr/lib/apache1/lingerd ]; then
 		if [ ! -f /var/lock/subsys/lingerd ]; then
-			msg_starting lingerd
+			msg_starting "Apache Lingerd"
 			SERVICE_UMASK=002 daemon --user http /usr/lib/apache1/lingerd
 			RETVAL=$?
 			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/lingerd
 		else
-			msg_already_running lingerd
+			msg_already_running "Apache Lingerd"
 		fi
 	fi
 	if [ ! -f /var/lock/subsys/apache ]; then
-		msg_starting apache
+		msg_starting "Apache 1.3 Web Server"
 		daemon /usr/sbin/apache $HTTPD_OPTS
 		RETVAL=$?
   		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/apache
 	else
-		msg_already_running apache
+		msg_already_running "Apache 1.3 Web Server"
 	fi
 }
 
 stop() {
 	# Stop daemons.
 	if [ -f /var/lock/subsys/apache ]; then
-		msg_stopping apache
+		msg_stopping "Apache 1.3 Web Server"
 		killproc --pidfile /var/run/apache.pid apache
 		rm -f /var/lock/subsys/apache /var/run/apache.pid /var/run/apache.loc* >/dev/null 2>&1
 	else
-		msg_not_running apache
+		msg_not_running "Apache 1.3 Web Server"
 	fi
 	if [ -x /usr/lib/apache1/lingerd ]; then
 		if [ -f /var/lock/subsys/lingerd ]; then
-			msg_stopping lingerd
+			msg_stopping "Apache Lingerd"
 			/usr/lib/apache1/lingerd -k && ok || fail
 			rm -f /var/lock/subsys/lingerd >/dev/null 2>&1
 		else
-			msg_not_running lingerd
+			msg_not_running "Apache Lingerd"
 		fi
 	fi
 }
@@ -95,7 +95,7 @@ reload() {
 	local sig=${1:-HUP}
 	local retnr=${2:-7}
 	if [ -f /var/lock/subsys/apache ]; then
-		msg_reloading apache
+		msg_reloading "Apache 1.3 Web Server"
 
 		configtest
 		if [ $RETVAL -eq 0 ]; then
@@ -106,7 +106,7 @@ reload() {
 			echo >&2 "Configuration file syntax test failed. Run $0 configtest to see errors."
 		fi
 	else
-		msg_not_running apache
+		msg_not_running "Apache 1.3 Web Server"
 		RETVAL=$retnr
 	fi
 }
@@ -127,7 +127,7 @@ case "$1" in
   	if [ -f /var/lock/subsys/apache ]; then
 		restart
 	else
-		msg_not_running apache
+		msg_not_running "Apache 1.3 Web Server"
 	fi
 	;;
   force-reload)
-- 
2.44.0