- unify with template

Changed files:
    courier-imap-pop3.init -> 1.19
    courier-imap.init -> 1.25

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 72f384a91eaefcf6cd2c31ef20e990736afeb7a3..75410509f44b3fc17bf7d8448ee7c88302989dc7 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -27,36 +27,59 @@ 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 ]; then
-               msg_starting pop3d
-               daemon $libexecdir/pop3d.rc start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
-       else
+       if [ -f /var/lock/subsys/courier-pop3 ]; then
                msg_already_running pop3d
+               return
        fi
-       ;;
-stop)
-       if [ -f /var/lock/subsys/courier-pop3 ]; then
-               msg_stopping pop3d
-               daemon $libexecdir/pop3d.rc stop
-               RETVAL=$?
-               rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
-       else
+
+       msg_starting pop3d
+       daemon $libexecdir/pop3d.rc start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/courier-pop3 ]; then
                msg_not_running pop3d
+               return
        fi
+
+       msg_stopping pop3d
+       daemon $libexecdir/pop3d.rc stop
+       RETVAL=$?
+       rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/courier-pop3 ]; then
+               msg_not_running pop3d
+               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.init b/courier-imap.init
index 470f5a48c52ebe4f3414c2d94f8f2934d93a69ca..106b1f507cd1160301be5fbc8761fe3c19851de1 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -27,36 +27,59 @@ 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 ]; then
-               msg_starting "Courier IMAP"
-               daemon $libexecdir/imapd.rc start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap
-       else
+       if [ -f /var/lock/subsys/courier-imap ]; then
                msg_already_running "Courier IMAP"
+               return
        fi
-       ;;
-stop)
-       if [ -f /var/lock/subsys/courier-imap ]; then
-               msg_stopping "Courier IMAP"
-               daemon $libexecdir/imapd.rc stop
-               RETVAL=$?
-               rm -f /var/lock/subsys/courier-imap >/dev/null 2>&1
-       else
+
+       msg_starting "Courier IMAP"
+       daemon $libexecdir/imapd.rc start
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-imap
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/courier-imap ]; then
                msg_not_running "Courier IMAP"
+               return
        fi
+
+       msg_stopping "Courier IMAP"
+       daemon $libexecdir/imapd.rc stop
+       RETVAL=$?
+       rm -f /var/lock/subsys/courier-imap >/dev/null 2>&1
+}
+
+condrestart() {
+       if [ ! -f /var/lock/subsys/courier-imap ]; then
+               msg_not_running "Courier IMAP"
+               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-ssl
        status couriertcpd
        exit $?