- 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 c95ec2cafa030c1473df8b0405745f1ed774ce15..dbda27c1f11c8d924136a5e32089b793135ba6f6 100644 (file)
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -4,9 +4,9 @@
 # chkconfig:   345 80 20
 # description: POP3 Daemon
 
-sysconfdir=/etc/courier-imap
-libexecdir=/usr/lib/courier-imap
-sbindir=/usr/sbin
+sysconfdir=@sysconfdir@
+libexecdir=@libexecdir@
+sbindir=@sbindir@
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -14,114 +14,76 @@ sbindir=/usr/sbin
 # 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
 
-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 ]; then
-
-        POP3DSTART=""
-        POP3DSSLSTART=""
-
-        if test -f $sysconfdir/pop3d
-        then
-            . $sysconfdir/pop3d
-        fi
+       if [ -f /var/lock/subsys/courier-pop3 ]; then
+               msg_already_running "Courier POP3D"
+               return
+       fi
 
-        case x$POP3DSTART in
-        x[yY]*)
-        # Start daemons.
-       msg_starting pop3d
-        $libexecdir/pop3d.rc start
+       msg_starting "Courier POP3D"
+       daemon $libexecdir/pop3d.rc start
        RETVAL=$?
-        if [ $RETVAL -eq 0 ]; then ok; else fail; fi
-        ;;
-        esac
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
+}
 
-        if test -f $sysconfdir/pop3d-ssl
-        then
-        . $sysconfdir/pop3d-ssl
-        fi
-
-        case x$POP3DSSLSTART in
-       x[yY]*)
-        if test -x $COURIERTLS
-       then
-       # First time we start this, generate a dummy SSL certificate.
-       if test ! -f $TLS_CERTFILE
-       then
-       echo -n " generating-SSL-certificate..."
-       $sbindir/mkpop3dcert >/dev/null 2>&1
+stop() {
+       if [ ! -f /var/lock/subsys/courier-pop3 ]; then
+               msg_not_running "Courier POP3D"
+               return
        fi
-       msg_starting pop3d-ssl
-        $libexecdir/pop3d-ssl.rc start
+
+       msg_stopping "Courier POP3D"
+       daemon $libexecdir/pop3d.rc stop
        RETVAL=$?
-       if [ $RETVAL -eq 0 ]; then ok; else fail; fi
+       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
-       ;;
-       esac
 
-       touch /var/lock/subsys/courier-pop3
-       else
-               msg_already_running "Courier POP3"
-       fi
+       stop
+       start
+}
+
+RETVAL=0
+# See how we were called.
+case "$1" in
+  start)
+       start
        ;;
   stop)
-       if [ -f /var/lock/subsys/courier-pop3 ]; then
-
-        . $sysconfdir/pop3d
-        if [ -f $PIDFILE ]; then
-           msg_stopping pop3d
-           $libexecdir/pop3d.rc stop
-           RETVAL=$?
-           if [ $RETVAL -eq 0 ]; then
-               ok
-               rm -f $PIDFILE
-           else
-               fail
-           fi
-       fi
-
-        . $sysconfdir/pop3d-ssl
-        if [ -f $SSLPIDFILE ]; then
-           msg_stopping pop3d-ssl
-           $libexecdir/pop3d-ssl.rc stop
-           RETVAL=$?
-           if [ $RETVAL -eq 0 ]; then
-               ok
-               rm -f $SSLPIDFILE
-           else 
-               fail
-           fi
-       fi
-
-       rm -f /var/lock/subsys/courier-pop3
-       else
-               msg_not_running "Courier POP3"
-       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