X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=courier-imap-pop3.init;h=84596325ad52b16320dde3b81cbd1209463338d6;hb=08bdf7d6d52d276993a32b32b961c7f74e2d83e9;hp=20deebd11f2f721473d86483990c6bed14b9864f;hpb=4f7296cbf085cac51eed03351d80be1142137c22;p=packages%2Fcourier-imap.git

diff --git a/courier-imap-pop3.init b/courier-imap-pop3.init
index 20deebd..8459632 100644
--- a/courier-imap-pop3.init
+++ b/courier-imap-pop3.init
@@ -4,22 +4,16 @@
 # chkconfig:	345 80 20
 # description:	POP3 Daemon
 
+sysconfdir=@sysconfdir@
+libexecdir=@libexecdir@
+sbindir=@sbindir@
+
 # Source function library
 . /etc/rc.d/init.d/functions
 
 # Get network config
 . /etc/sysconfig/network
 
-ADDRESS=0.0.0.0
-MAXPERIP=4
-MAXDAEMONS=40
-MAILDIR="Mail/Maildir"
-TCPDOPTS=
-POP3DSSLSTART="no"
-
-# 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
@@ -33,85 +27,37 @@ 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
-		# 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-pop3 | \
-			sed 's/=.*//;s/^/export /;s/$/;/'` \
-			/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-			-stderrlogger=/usr/lib/courier-imap/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"
+		msg_starting pop3d
+		daemon $libexecdir/pop3d.rc start
 		RETVAL=$?
-		if [ $RETVAL -eq 0 ]; then
-			ok
-		else
-			fail
-		fi
-
-		if is_yes "$POP3DSSLSTART"; then
-			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-pop3 | \
-				sed 's/=.*//;s/^/export /;s/$/;/'`
-				/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
-				-stderrlogger=/usr/lib/courier-imap/courierlogger \
-				-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-pop3
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/courier-pop3
 	else
-		msg_already_running "Courier POP3"
+		msg_already_running pop3d
 	fi
-	;;
-  stop)
+;;
+stop)
 	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 POP3 (SSL)"
-			daemon /usr/lib/courier-imap/couriertcpd -pid=/var/run/pop3d-ssl.pid -stop
-		fi
-		rm -f /var/lock/subsys/courier-pop3
+		msg_stopping pop3d
+		daemon $libexecdir/pop3d.rc stop
+		RETVAL=$?
+		rm -f /var/lock/subsys/courier-pop3 >/dev/null 2>&1
 	else
-		msg_not_running "Courier POP3"
+		msg_not_running pop3d
 	fi
-	;;
-  restart|force-reload)
+;;
+restart|force-reload)
 	$0 stop
 	$0 start
 	exit $?
 	;;
-  status)
+status)
 	status couriertcpd
 	exit $?
 	;;
-  *)
+*)
 	msg_usage "$0 {start|stop|restart|force-reload|status}"
 	exit 3
 esac