Author: glen Date: Mon Dec 8 10:20:02 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- use nice service names
---- Files affected:
SOURCES:
apache.init (1.62 -> 1.63) , apache1.init (1.29 -> 1.30) , lighttpd.init
(1.12 -> 1.13)
---- Diffs:
================================================================
Index: SOURCES/apache.init
diff -u SOURCES/apache.init:1.62 SOURCES/apache.init:1.63
--- SOURCES/apache.init:1.62 Wed Oct 15 14:48:51 2008
+++ SOURCES/apache.init Mon Dec 8 11:19:55 2008
@@ -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 @@
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 @@
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 @@
stop
start
else
- msg_not_running httpd.${HTTPD_MPM}
+ msg_not_running "$SVC_NAME"
RETVAL=$1
fi
}
@@ -102,20 +103,20 @@
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
================================================================
Index: SOURCES/apache1.init
diff -u SOURCES/apache1.init:1.29 SOURCES/apache1.init:1.30
--- SOURCES/apache1.init:1.29 Wed Oct 15 14:48:51 2008
+++ SOURCES/apache1.init Mon Dec 8 11:19:56 2008
@@ -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 @@
# 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 @@
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 @@
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 @@
if [ -f /var/lock/subsys/apache ]; then
restart
else
- msg_not_running apache
+ msg_not_running "Apache 1.3 Web Server"
fi
;;
force-reload)
================================================================
Index: SOURCES/lighttpd.init
diff -u SOURCES/lighttpd.init:1.12 SOURCES/lighttpd.init:1.13
--- SOURCES/lighttpd.init:1.12 Thu Mar 29 16:49:34 2007
+++ SOURCES/lighttpd.init Mon Dec 8 11:19:56 2008
@@ -19,7 +19,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 lighttpd
+ msg_network_down "Lighttpd Web Server"
exit 1
fi
else
@@ -27,7 +27,7 @@
fi
configtest() {
- out=`env SHELL=/bin/sh lighttpd -t -f /etc/lighttpd/lighttpd.conf
$HTTPD_OPTS 2>&1`
+ out=$(env SHELL=/bin/sh lighttpd -t -f /etc/lighttpd/lighttpd.conf
$HTTPD_OPTS 2>&1)
rc=$?
if [ "$rc" = 0 ]; then
return
@@ -67,20 +67,20 @@
start)
# Check if the service is already running?
if [ ! -f /var/lock/subsys/lighttpd ]; then
- msg_starting lighttpd
+ msg_starting "Lighttpd Web Server"
configtest || exit 1
start
else
- msg_already_running lighttpd
+ msg_already_running "Lighttpd Web Server"
fi
;;
stop)
# Stop daemons.
if [ -f /var/lock/subsys/lighttpd ]; then
- msg_stopping lighttpd
+ msg_stopping "Lighttpd Web Server"
stop
else
- msg_not_running lighttpd
+ msg_not_running "Lighttpd Web Server"
fi
;;
status)
@@ -94,29 +94,29 @@
# short circuit to safe reload if pid exists and is alive
pid=$(pidofproc lighttpd lighttpd.pid)
if [ "$pid" ] && checkpid $pid; then
- msg_reloading lighttpd
+ msg_reloading "Lighttpd Web Server"
reload
else
- msg_stopping lighttpd
+ msg_stopping "Lighttpd Web Server"
stop
- msg_starting lighttpd
+ msg_starting "Lighttpd Web Server"
start
fi
RETVAL=$?
else
- msg_not_running lighttpd
- msg_starting lighttpd
+ msg_not_running "Lighttpd Web Server"
+ msg_starting "Lighttpd Web Server"
start
fi
;;
reload|graceful|force-reload)
if [ -f /var/lock/subsys/lighttpd ]; then
- msg_reloading lighttpd
+ msg_reloading "Lighttpd Web Server"
configtest || exit 1
reload
RETVAL=$?
else
- msg_not_running lighttpd
+ msg_not_running "Lighttpd Web Server"
RETVAL=7
fi
;;
@@ -132,7 +132,7 @@
killproc --pidfile /var/run/lighttpd.pid lighttpd -HUP
RETVAL=$?
else
- msg_not_running lighttpd
+ msg_not_running "Lighttpd Web Server"
RETVAL=7
fi
;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache.init?r1=1.62&r2=1.63&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/apache1.init?r1=1.29&r2=1.30&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/lighttpd.init?r1=1.12&r2=1.13&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
