- rel. 2 for Ra, rel. 3 for Ac

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

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 70440d610b5521cd58cde841728c84fb53527d2e..20f872bd63ef4906765619c8543ad1bc72514ada 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -1,8 +1,8 @@
 #!/bin/sh
-# IMAP Daemon
+# POP3 Daemon
 #
 # chkconfig:   345 80 20
-# description: IMAP Daemon
+# description: POP3 Daemon
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -13,31 +13,47 @@
 ADDRESS=0.0.0.0
 MAXPERIP=4
 MAXDAEMONS=40
-MAILDIR="Maildir"
+MAILDIR="Mail/Maildir"
 TCPDOPTS=
 POP3DSSLSTART="no"
 
 # Get service config
-[ -f /etc/sysconfig/courier-imap-pop3 ] && . /etc/sysconfig/courier-imap-pop3
+[ -f /etc/sysconfig/courier-pop3 ] && . /etc/sysconfig/courier-pop3
 
 # Check that networking is up.
-if is_no "${NETWORKING}" ; then
-       msg_network_down "Courier IMAP - POP3"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "Courier POP3"
+               exit 1
+       fi
+else
+       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-imap-pop3 ]; then
-               msg_starting "Courier IMAP - POP3"
-               /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap-pop3 ; \
+       if [ ! -f /var/lock/subsys/courier-pop3 ]; then
+               # start authdaemon, if not running..
+               if [ ! -f /var/lock/subsys/authdaemon -a \
+                  -x /etc/rc.d/init.d/authdaemon ]; then
+                       /etc/rc.d/init.d/authdaemon start
+                       RETVAL=$?
+                       if [ $RETVAL -ne 0 ]; then
+                               msg_starting "Courier POP3"
+                               fail
+                               exit 1
+                       fi
+               fi
+               msg_starting "Courier POP3"
+               /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-pop3 ; \
                        POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
-                       `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
+                       `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-pop3 | \
                        sed 's/=.*//;s/^/export /;s/$/;/'` \
                        /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                       -stderrlogger=/usr/lib/courier-imap/courierlogger \
+                       -stderrlogger=/usr/sbin/courierlogger \
                        -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
                        -pid=/var/run/pop3d.pid $TCPDOPTS 110 /usr/sbin/pop3login \
                        /usr/lib/courier-imap/authlib/authdaemon /usr/bin/pop3d $MAILDIR"
@@ -48,15 +64,14 @@ case "$1" in
                        fail
                fi
 
-               
                if is_yes "$POP3DSSLSTART"; then
-                       msg_starting "Courier IMAP - POP3 (SSL)"
-                       /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap-pop3 ; \
+                       msg_starting "Courier POP3 (SSL)"
+                       /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-pop3 ; \
                                POP3_TLS=1; export POP3_TLS; \
-                               `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
+                               `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-pop3 | \
                                sed 's/=.*//;s/^/export /;s/$/;/'`
                                /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                               -stderrlogger=/usr/lib/courier-imap/courierlogger \
+                               -stderrlogger=/usr/sbin/courierlogger \
                                -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
                                -pid=/var/run/pop3d-ssl.pid $TCPDOPTS \
                                995 /usr/bin/couriertls -server -tcpd \
@@ -69,38 +84,36 @@ case "$1" in
                                fail
                        fi
                fi
-               touch /var/lock/subsys/courier-imap-pop3
+               touch /var/lock/subsys/courier-pop3
        else
-               msg_already_running "Courier IMAP - POP3"
-               exit 1
+               msg_already_running "Courier POP3"
        fi
        ;;
   stop)
-       if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
-               msg_stopping "Courier IMAP - POP3"
+       if [ -f /var/lock/subsys/courier-pop3 ]; then
+               msg_stopping "Courier POP3"
                daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/pop3d.pid -stop
                if is_yes "$POP3DSSLSTART"; then
-                       msg_stopping "Courier IMAP - POP3 (SSL)"
+                       msg_stopping "Courier POP3 (SSL)"
                        daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/pop3d-ssl.pid -stop
                fi
-               RETVAL=$?
-               rm -f /var/lock/subsys/courier-imap-pop3
+               rm -f /var/lock/subsys/courier-pop3
        else
-               msg_not_running "Courier IMAP - POP3"
-               exit 1
+               msg_not_running "Courier POP3"
        fi
        ;;
-  restart|reload)
+  restart|force-reload)
        $0 stop
        $0 start
+       exit $?
        ;;
   status)
        status couriertcpd
+       exit $?
        ;;
   *)
-       msg_usage "$0 {start|stop|restart|reload|status}"
-       exit 1
+       msg_usage "$0 {start|stop|restart|force-reload|status}"
+       exit 3
 esac
 
 exit $RETVAL
-