- 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 c51ef88048ffebd90f7a758dc176a858172add95..661fd9ed27376f35c2df260495fb7978aaadb9c5 100644 (file)
--- a/courier-imap-pop3-ssl.init
+++ b/courier-imap-pop3-ssl.init
@@ -14,58 +14,82 @@ 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
-       exit 1
-    fi
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "Courier POP3D SSL"
+               exit 1
+       fi
 else
-    exit 0
+       exit 0
 fi
 
-RETVAL=0
-# See how we were called.
-case "$1" in
-    start)
-    # Check if the service is already running?
-    if [ ! -f /var/lock/subsys/courier-pop3-ssl ]; then
+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 "pop3d-ssl cert generation"
-           daemon $sbindir/mkpop3dcert
+               msg_starting "Courier POP3D SSL Cert generation"
+               daemon $sbindir/mkpop3dcert
        fi
-       . $sysconfdir/pop3d-ssl
-       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
-    fi
-    ;;
-    stop)
-    if [ -f /var/lock/subsys/courier-pop3-ssl ]; then
-       . $sysconfdir/pop3d-ssl
-       msg_stopping pop3d-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
-    else
-       msg_not_running pop3d-ssl
-    fi
-    ;;
-    restart|force-reload)
-    $0 stop
-    $0 start
-    exit $?
-    ;;
-    status)
-    status couriertcpd
-    exit $?
-    ;;
-    *)
-    msg_usage "$0 {start|stop|restart|force-reload|status}"
-    exit 3
+}
+
+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
+       ;;
+  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
 
 exit $RETVAL