Author: glen Date: Wed Mar 22 12:16:01 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- full service names
---- Files affected:
SOURCES:
courier-imap-ssl.init (1.2 -> 1.3) , courier-imap.init (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SOURCES/courier-imap-ssl.init
diff -u SOURCES/courier-imap-ssl.init:1.2 SOURCES/courier-imap-ssl.init:1.3
--- SOURCES/courier-imap-ssl.init:1.2 Fri Oct 7 16:32:59 2005
+++ SOURCES/courier-imap-ssl.init Wed Mar 22 13:15:56 2006
@@ -1,8 +1,8 @@
#!/bin/sh
-# IMAP SSL Daemon
+# Courier IMAP SSL Daemon
#
# chkconfig: 345 80 20
-# description: IMAP SSL Daemon
+# description: Courier IMAP SSL Daemon
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -17,7 +17,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 imapd-ssl
+ msg_network_down "Courier IMAP SSL"
exit 1
fi
else
@@ -31,11 +31,11 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/courier-imap-ssl ]; then
if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
- msg_starting "imapd-ssl cert generation"
+ msg_starting "Courier IMAP SSL cert generation"
daemon $sbindir/mkimapdcert
fi
. $sysconfdir/imapd-ssl
- msg_starting imapd-ssl
+ msg_starting "Courier IMAP SSL"
daemon $libexecdir/imapd-ssl.rc start
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap-ssl
@@ -46,12 +46,12 @@
stop)
if [ -f /var/lock/subsys/courier-imap-ssl ]; then
. $sysconfdir/imapd-ssl
- msg_stopping imapd-ssl
+ msg_stopping "Courier IMAP SSL"
daemon $libexecdir/imapd-ssl.rc stop
RETVAL=$?
rm -f /var/lock/subsys/courier-imap-ssl >/dev/null 2>&1
else
- msg_not_running imapd-ssl
+ msg_not_running "Courier IMAP SSL"
fi
;;
restart|force-reload)
@@ -60,6 +60,7 @@
exit $?
;;
status)
+ # FIXME: matches other services, like courier-imap
status couriertcpd
exit $?
;;
================================================================
Index: SOURCES/courier-imap.init
diff -u SOURCES/courier-imap.init:1.20 SOURCES/courier-imap.init:1.21
--- SOURCES/courier-imap.init:1.20 Fri Oct 7 16:32:59 2005
+++ SOURCES/courier-imap.init Wed Mar 22 13:15:56 2006
@@ -1,8 +1,8 @@
#!/bin/sh
-# IMAP Daemon
+# Courier IMAP Daemon
#
# chkconfig: 345 80 20
-# description: IMAP Daemon
+# description: Courier IMAP Daemon
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -31,23 +31,23 @@
# Check if the service is already running?
if [ ! -f /var/lock/subsys/courier-imap ]; then
. $sysconfdir/imapd
- msg_starting imapd
+ msg_starting "Courier IMAP"
daemon $libexecdir/imapd.rc start
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap
else
- msg_already_running imapd
+ msg_already_running "Courier IMAP"
fi
;;
stop)
if [ -f /var/lock/subsys/courier-imap ]; then
. $sysconfdir/imapd
- msg_stopping imapd
+ msg_stopping "Courier IMAP"
daemon $libexecdir/imapd.rc stop
RETVAL=$?
rm -f /var/lock/subsys/courier-imap >/dev/null 2>&1
else
- msg_not_running imapd
+ msg_not_running "Courier IMAP"
fi
;;
restart|force-reload)
@@ -56,6 +56,7 @@
exit $?
;;
status)
+ # FIXME: matches other services, like courier-imap-ssl
status couriertcpd
exit $?
;;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/courier-imap-ssl.init?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/courier-imap.init?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
