- service name caps unified

Changed files:
    courier-imap-pop3-ssl.init -> 1.5
    courier-imap-pop3.init -> 1.20

diff --git a/courier-imap-pop3-ssl.init b/courier-imap-pop3-ssl.init
index 1e651d62a6d316a9f97c7e9f2298dd36b4bedf6d..fa64676df72bee70770754bf85d05832c165d43b 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -20,7 +20,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 pop3d-ssl
+               msg_network_down "Courier POP3D SSL"
                exit 1
        fi
 else
@@ -34,25 +34,25 @@ start)
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/courier-pop3-ssl ]; then
                if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
-                       msg_starting "pop3d-ssl cert generation"
+                       msg_starting "Courier POP3D SSL Cert generation"
                        daemon $sbindir/mkpop3dcert
                fi
-               msg_starting pop3d-ssl
+               msg_starting "Courier POP3D SSL"
                daemon $libexecdir/pop3d-ssl.rc start
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3-ssl
        else
-               msg_already_running pop3d-ssl
+               msg_already_running "Courier POP3D SSL"
        fi
        ;;
 stop)
        if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
-               msg_stopping pop3d-ssl
+               msg_stopping "Courier POP3D SSL"
                daemon $libexecdir/pop3d-ssl.rc stop
                RETVAL=$?
                rm -f /var/lock/subsys/courier-pop3-ssl >/dev/null 2>&1
        else
-               msg_not_running pop3d-ssl
+               msg_not_running "Courier POP3D SSL"
        fi
        ;;
 restart|force-reload)

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 75410509f44b3fc17bf7d8448ee7c88302989dc7..dbda27c1f11c8d924136a5e32089b793135ba6f6 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -20,7 +20,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 "Courier POP3"
+               msg_network_down "Courier POP3D"
                exit 1
        fi
 else
@@ -30,11 +30,11 @@ fi
 start() {
        # Check if the service is already running?
        if [ -f /var/lock/subsys/courier-pop3 ]; then
-               msg_already_running pop3d
+               msg_already_running "Courier POP3D"
                return
        fi
 
-       msg_starting pop3d
+       msg_starting "Courier POP3D"
        daemon $libexecdir/pop3d.rc start
        RETVAL=$?
        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
@@ -42,11 +42,11 @@ start() {
 
 stop() {
        if [ ! -f /var/lock/subsys/courier-pop3 ]; then
-               msg_not_running pop3d
+               msg_not_running "Courier POP3D"
                return
        fi
 
-       msg_stopping pop3d
+       msg_stopping "Courier POP3D"
        daemon $libexecdir/pop3d.rc stop
        RETVAL=$?
        rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
@@ -54,7 +54,7 @@ stop() {
 
 condrestart() {
        if [ ! -f /var/lock/subsys/courier-pop3 ]; then
-               msg_not_running pop3d
+               msg_not_running "Courier POP3D"
                RETVAL=$1
                return
        fi