- unify with template

Changed files:
    courier-imap-pop3-ssl.init -> 1.6
    courier-imap-ssl.init -> 1.6

diff --git a/courier-imap-pop3-ssl.init b/courier-imap-pop3-ssl.init
index fa64676df72bee70770754bf85d05832c165d43b..661fd9ed27376f35c2df260495fb7978aaadb9c5 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -27,40 +27,63 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-start)
+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 "Courier POP3D SSL Cert generation"
-                       daemon $sbindir/mkpop3dcert
-               fi
-               msg_starting "Courier POP3D SSL"
-               daemon $libexecdir/pop3d-ssl.rc start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3-ssl
-       else
+       if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
                msg_already_running "Courier POP3D SSL"
+               return
        fi
-       ;;
-stop)
-       if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
-               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
+
+       if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
+               msg_starting "Courier POP3D SSL Cert generation"
+               daemon $sbindir/mkpop3dcert
+       fi
+       msg_starting "Courier POP3D SSL"
+       daemon $libexecdir/pop3d-ssl.rc start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3-ssl
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/courier-pop3-ssl ]; then
+               msg_not_running "Courier POP3D SSL"
+               return
+       fi
+
+       msg_stopping "Courier POP3D SSL"
+       daemon $libexecdir/pop3d-ssl.rc stop
+       RETVAL=$?
+       rm -f /var/lock/subsys/courier-pop3-ssl >/dev/null 2>&1
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/courier-pop3-ssl ]; then
                msg_not_running "Courier POP3D SSL"
+               RETVAL=$1
+               return
        fi
+
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
        ;;
-restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  force-reload)
+       condrestart 7
        ;;
-status)
+  status)
        status couriertcpd
        exit $?
        ;;

diff --git a/courier-imap-ssl.init b/courier-imap-ssl.init
index e05bcccdf88d97b0d8169541ab7de6343709c902..98907fe2c259220e65ae7ae28db2f941c9024b03 100644 (file)
--- a/courier-imap-ssl.init
+++ b/courier-imap-ssl.init
@@ -27,40 +27,63 @@ else
        exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-start)
+start() {
        # Check if the service is already running?
+       if [ -f /var/lock/subsys/courier-imap-ssl ]; then
+               msg_already_running "Courier IMAP SSL"
+               return
+       fi
+
+       if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
+               msg_starting "Courier IMAP SSL cert generation"
+               daemon $sbindir/mkimapdcert
+       fi
+       msg_starting "Courier IMAP SSL"
+       daemon $libexecdir/imapd-ssl.rc start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap-ssl
+}
+
+stop() {
        if [ ! -f /var/lock/subsys/courier-imap-ssl ]; then
-               if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
-                       msg_starting "Courier IMAP SSL cert generation"
-                       daemon $sbindir/mkimapdcert
-               fi
-               msg_starting "Courier IMAP SSL"
-               daemon $libexecdir/imapd-ssl.rc start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap-ssl
-       else
-               msg_already_running imapd-ssl
+               msg_not_running "Courier IMAP SSL"
+               return
        fi
-       ;;
-stop)
-       if [ -f /var/lock/subsys/courier-imap-ssl ]; then
-               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_stopping "Courier IMAP SSL"
+       daemon $libexecdir/imapd-ssl.rc stop
+       RETVAL=$?
+       rm -f /var/lock/subsys/courier-imap-ssl >/dev/null 2>&1
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/courier-imap-ssl ]; then
                msg_not_running "Courier IMAP SSL"
+               RETVAL=$1
+               return
        fi
+
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
        ;;
-restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  force-reload)
+       condrestart 7
        ;;
-status)
+  status)
        # FIXME: matches other services, like courier-imap
        status couriertcpd
        exit $?