- updated to 5.1.7

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

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index eca3c0ff8551c3bdcc213960f8344bc9ade027b4..dbda27c1f11c8d924136a5e32089b793135ba6f6 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -14,52 +14,76 @@ sbindir=@sbindir@
 # Get network config
 . /etc/sysconfig/network
 
+# Get service config
+[ -f /etc/sysconfig/courier-pop3 ] && . /etc/sysconfig/courier-pop3
+
 # 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
        exit 0
 fi
 
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/courier-pop3 ]; then
+               msg_already_running "Courier POP3D"
+               return
+       fi
+
+       msg_starting "Courier 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 "Courier POP3D"
+               return
+       fi
+
+       msg_stopping "Courier 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 "Courier POP3D"
+               RETVAL=$1
+               return
+       fi
+
+       stop
+       start
+}
+
 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 ]; then
-               . $sysconfdir/pop3d
-               msg_starting pop3d
-               daemon $libexecdir/pop3d.rc start
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
-       else
-               msg_already_running pop3d
-       fi
-        ;;
+       start
+       ;;
   stop)
-       if [ -f /var/lock/subsys/courier-pop3 ]; then
-               . $sysconfdir/pop3d
-               msg_stopping pop3d
-               daemon $libexecdir/pop3d.rc stop
-               RETVAL=$?
-               rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
-       else
-               msg_not_running pop3d
-       fi
+       stop
        ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
+  restart)
+       stop
+       start
+       ;;
+  force-reload)
+       condrestart 7
        ;;
   status)
        status couriertcpd
        exit $?
        ;;
-  *)
+*)
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac