X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=courier-imap-pop3.init;h=49cc5738a53938f9be9add207292a23ad83f9769;hb=19bd41bc83cd2ac3bb0104750efc43547d2962b1;hp=380c4e637dc57b8294b6260dc222992900c5b956;hpb=7ea5697f8ed64eabc5756af34152c0ab28380200;p=packages%2Fcourier-imap.git

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 380c4e6..49cc573 100644
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -1,8 +1,12 @@
 #!/bin/sh
-# IMAP Daemon
+# POP3 Daemon
 #
 # chkconfig:	345 80 20
-# description:	IMAP Daemon
+# description:	POP3 Daemon
+
+sysconfdir=@sysconfdir@
+libexecdir=@libexecdir@
+sbindir=@sbindir@
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -10,97 +14,116 @@
 # Get network config
 . /etc/sysconfig/network
 
-ADDRESS=0.0.0.0
-MAXPERIP=4
-MAXDAEMONS=40
-MAILDIR="Maildir"
-TCPDOPTS=
-POP3DSSLSTART="no"
-
-# Get service config
-[ -f /etc/sysconfig/courier-imap-pop3 ] && . /etc/sysconfig/courier-imap-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 ; \
-			POP3_STARTTLS=$POP3DSTARTTLS ; export POP3_STARTTLS ; \
-			`sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
-			sed 's/=.*//;s/^/export /;s/$/;/'` \
-			/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-			-stderrlogger=/usr/lib/courier-imap/logger \
-			-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-			-pid=/var/run/pop3d.pid $TCPDOPTS 110 /usr/sbin/pop3login \
-			/usr/lib/courier-imap/authlib/authdaemon /usr/bin/pop3d $MAILDIR"
-		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			ok
-		else
-			fail
-		fi
-
-		
-		if is_yes "$POP3DSSLSTART"; then
-			msg_starting "Courier IMAP - POP3 (SSL)"
-			/usr/bin/env - /bin/sh -c " . /etc/sysconfig/courier-imap-pop3 ; \
-				POP3_TLS=1; export POP3_TLS; \
-				`sed -n '/^#/d;/=/p' </etc/sysconfig/courier-imap-pop3 | \
-				sed 's/=.*//;s/^/export /;s/$/;/'`
-				/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-				-stderrlogger=/usr/lib/courier-imap/logger \
-				-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
-				-pid=/var/run/pop3d-ssl.pid $TCPDOPTS \
-				995 /usr/bin/couriertls -server -tcpd \
-				/usr/sbin/pop3login /usr/lib/courier-imap/authlib/authdaemon \
-				/usr/bin/pop3d $MAILDIR"
-			RETVAL=$?
-			if [ $RETVAL -eq 0 ]; then
-				ok
-			else
-				fail
-			fi
-		fi
-		touch /var/lock/subsys/courier-imap-pop3
+	if [ ! -f /var/lock/subsys/courier-pop3 ]; then
+
+        POP3DSTART=""
+        POP3DSSLSTART=""
+
+        if test -f $sysconfdir/pop3d
+        then
+            . $sysconfdir/pop3d
+        fi
+
+        case x$POP3DSTART in
+        x[yY]*)
+        # Start daemons.
+	msg_starting pop3d
+        $libexecdir/pop3d.rc start
+	RETVAL=$?
+        if [ $RETVAL -eq 0 ]; then ok; else fail; fi
+        ;;
+        esac
+
+        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
+	fi
+	msg_starting pop3d-ssl
+        $libexecdir/pop3d-ssl.rc start
+	RETVAL=$?
+    	if [ $RETVAL -eq 0 ]; then ok; else fail; fi
+
+	fi
+	;;
+	esac
+
+	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"
-		daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/pop3d.pid -stop
-		if is_yes "$POP3DSSLSTART"; then
-			msg_stopping "Courier IMAP - 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
+	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 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
-