- PLDized

Changed files:
    postgrey.init -> 1.2

1 files changed, 51 insertions, 60 deletions

diff --git a/postgrey.init b/postgrey.init
index ce2120c..51ef002 100644
--- a/postgrey.init
+++ b/postgrey.init
@@ -1,90 +1,81 @@
 #!/bin/sh
 #
+# postgrey	Postfix Greylisting Policy Server
 #
-# chkconfig: 2345 79 31
-# description: Postfix Greylisting Policy Server
+# chkconfig:	2345 79 31
+# description:	Postfix Greylisting Policy Server
 #
-# processname: postgrey
-# pidfile: /var/run/greylist.pid
+# processname:	postgrey
+# pidfile:	/var/run/greylist.pid
 #
 
-# Source function library.
+# Source function library
 . /etc/rc.d/init.d/functions
 
-# Source networking configuration.
+# Get network config
 . /etc/sysconfig/network
 
-# Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+OPTIONS="--unix=/var/spool/postfix/postgrey/socket"
 
-prog=postgrey
-postgrey=/usr/sbin/$prog
-DBPATH=/var/spool/postfix/postgrey
-SOCKET=$DBPATH/socket
-OPTIONS="--unix=$SOCKET"
+# Get service config
+[ -f /etc/sysconfig/postgrey ] && . /etc/sysconfig/postgrey
 
-# Source an auxiliary options file if we have one, and pick up OPTIONS,
-if [ -r /etc/sysconfig/$prog ] ; then
-        . /etc/sysconfig/$prog
+# 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 postgrey
+		exit 1
+	fi
+else
+	exit 0
 fi
 
-[ -x $postgrey ] || exit 0
-[ -d $DBPATH ] || exit 0
-#[ -f /etc/postfix/postgrey_whitelist_clients ] || exit 0
-#[ -f /etc/postfix/postgrey_whitelist_recipients ] || exit 0
-
 RETVAL=0
 
-start() {
-        echo -n $"Starting $prog: "
-        daemon $postgrey -d $OPTIONS
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
-        return $RETVAL
-}
-stop() {
-        echo -n $"Stopping $prog: "
-        killproc $postgrey
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
-}
-
-restart() {
-	stop
-	start
-}
-
-reload() {
-	echo -n $"Reloading $prog: "
-	killproc $prog -HUP
-	RETVAL=$?
-	echo
-	return $RETVAL
-}
- 
 # See how we were called.
 case "$1" in
   start)
-	start
+	# Check if the service is already running?
+	if [ ! -f /var/lock/subsys/postgrey ]; then
+		msg_starting postgrey
+		daemon postgrey -d $OPTIONS
+		RETVAL=$?
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/postgrey
+	else
+		msg_already_running postgrey
+	fi
 	;;
   stop)
-	stop
+	if [ -f /var/lock/subsys/postgrey ]; then
+		msg_stopping postgrey
+		killproc postgrey
+		rm -f /var/lock/subsys/postgrey >/dev/null 2>&1
+	else
+		msg_not_running postgrey
+	fi
 	;;
   restart)
-	stop
-	start
+	$0 stop
+	$0 start
+	exit $?
 	;;
-  reload)
-	reload
+  reload|force-reload)
+	if [ -f /var/lock/subsys/postgrey ]; then
+		msg_reloading postgrey
+		killproc postgrey -HUP
+		RETVAL=$?
+	else
+		msg_not_running postgrey >&2
+		exit 7
+	fi
 	;;
   status)
-  	status $prog
+	status postgrey
+	exit $?
 	;;
   *)
-	echo "Usage: $prog {start|stop|restart|reload|status}"
-	exit 1
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
+	exit 3
 esac
 
-exit $?
+exit $RETVAL