- rediff patch, merge triggers for rpm4, rel 2

[packages/courier-imap.git] / courier-imap-pop3-ssl.init

diff --git a/courier-imap-pop3-ssl.init b/courier-imap-pop3-ssl.init
index 9300a5ff2464c5e586b4a5b03ab92d7e0d6e6289..661fd9ed27376f35c2df260495fb7978aaadb9c5 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -14,54 +14,80 @@ sbindir=@sbindir@
 # Get network config
 . /etc/sysconfig/network
 
+# Get service config
+[ -f /etc/sysconfig/courier-pop3-ssl ] && . /etc/sysconfig/courier-pop3-ssl
+
 # 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
        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
+               msg_already_running "Courier POP3D SSL"
+               return
+       fi
+
+       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
-               if [ -x "$COURIERTLS" -a ! -f "$TLS_CERTFILE" ]; then
-                       msg_starting "pop3d-ssl cert generation"
-                       daemon $sbindir/mkpop3dcert
-               fi
-               msg_starting 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_not_running "Courier POP3D SSL"
+               return
        fi
-;;
-stop)
-       if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
-               msg_stopping 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_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
-;;
-restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
-;;
-status)
+
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
+       ;;
+  restart)
+       stop
+       start
+       ;;
+  force-reload)
+       condrestart 7
+       ;;
+  status)
        status couriertcpd
        exit $?
-;;
-       *)
+       ;;
+*)
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac