- full service names

Changed files:
    courier-imap-ssl.init -> 1.3
    courier-imap.init -> 1.21

diff --git a/courier-imap-ssl.init b/courier-imap-ssl.init
index 0075ded00f4fbc7795a8112ec78eca01aea27732..690e50bf915f734c2bfa3ddb1b229e7828ba5e88 100644 (file)
--- a/courier-imap-ssl.init
+++ b/courier-imap-ssl.init
@@ -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
 
 sysconfdir=@sysconfdir@
 libexecdir=@libexecdir@
@@ -17,7 +17,7 @@ sbindir=@sbindir@
 # 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 @@ start)
        # 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 @@ start)
 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 @@ restart|force-reload)
        exit $?
 ;;
 status)
+       # FIXME: matches other services, like courier-imap
        status couriertcpd
        exit $?
 ;;

diff --git a/courier-imap.init b/courier-imap.init
index c07a15a1310536f261cde4a65c2db798f0fd23a6..3b2e27ba10e6b95c552358bf1f44f681d3a44921 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -1,8 +1,8 @@
 #!/bin/sh
-# IMAP Daemon
+# Courier IMAP Daemon
 #
 # chkconfig:   345 80 20
-# description: IMAP Daemon
+# description: Courier IMAP Daemon
 
 sysconfdir=@sysconfdir@
 libexecdir=@libexecdir@
@@ -31,23 +31,23 @@ start)
        # 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 @@ restart|force-reload)
        exit $?
        ;;
 status)
+       # FIXME: matches other services, like courier-imap-ssl
        status couriertcpd
        exit $?
        ;;