- update to 2.1.1 by Andree

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

diff --git a/courier-imap.init b/courier-imap.init
index c2434bcb9b78693f1567953b63866feee5e79ea9..b169ae3720855c4e421402e43776952aab530831 100644 (file)
--- a/courier-imap.init
+++ b/courier-imap.init
@@ -21,26 +21,42 @@ IMAPDSSLSTART="no"
 [ -f /etc/sysconfig/courier-imap ] && . /etc/sysconfig/courier-imap
 
 # Check that networking is up.
-if is_no "${NETWORKING}" ; then
-       msg_Network_Down "Courier IMAP"
-       exit 1
+if is_yes "${NETWORKING}"; then
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
+               msg_network_down "Courier IMAP"
+               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 ]; 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 IMAP"
+                               fail
+                               exit 1
+                       fi
+               fi
                msg_starting "Courier IMAP"
+               busy
                ulimit -d $IMAP_ULIMITD
                /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap ; \
-                       IMAP_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
                        `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap | \
                        sed 's/=.*//;s/^/export /;s/$/;/'` \
                        /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                       -stderrlogger=/usr/lib/courier-imap/logger \
+                       -stderrlogger=/usr/lib/courier-imap/courierlogger \
                        -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-                       -pid=/var/run/imapd.pid $TCPDOPTS 143 /usr/sbin/imaplogin \
+                       -pid=/var/run/imapd.pid $TCPDOPTS $PORTS /usr/sbin/imaplogin \
                        /usr/lib/courier-imap/authlib/authdaemon /usr/bin/imapd $MAILDIR"
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
@@ -53,14 +69,14 @@ case "$1" in
                if is_yes "$IMAPDSSLSTART"; then
                        msg_starting "Courier IMAP (SSL)"
                        /usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap ; \
-                               IMAP_TLS=1; export POP3_TLS; \
+                               IMAP_TLS=1; export IMAP_TLS; \
                                `sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap | \
                                sed 's/=.*//;s/^/export /;s/$/;/'`
-                               /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-                               -stderrlogger=/usr/lib/courier-imap/logger \
+                               /usr/lib/courier-imap/couriertcpd -address=$ADDRESS_SSL \
+                               -stderrlogger=/usr/lib/courier-imap/courierlogger \
                                -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
                                -pid=/var/run/imapd-ssl.pid $TCPDOPTS \
-                               993 /usr/bin/couriertls -server -tcpd \
+                               $PORTS_SSL $COURIERTLS -server -tcpd \
                                /usr/sbin/imaplogin /usr/lib/courier-imap/authlib/authdaemon \
                                /usr/bin/imapd $MAILDIR"
                        RETVAL=$?
@@ -72,8 +88,7 @@ case "$1" in
                fi
                touch /var/lock/subsys/courier-imap
        else
-               msg_Already_Running "Courier IMAP"
-               exit 1
+               msg_already_running "Courier IMAP"
        fi
        ;;
   stop)
@@ -84,24 +99,23 @@ case "$1" in
                        msg_stopping "Courier IMAP (SSL)"
                        daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/imapd-ssl.pid -stop
                fi
-               RETVAL=$?
                rm -f /var/lock/subsys/courier-imap
        else
                msg_not_running "Courier IMAP"
-               exit 1
        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
-