packages: tacacs/tacacs.init - full path to binary, added missing --pidfile...

[gotar]

Author: gotar                        Date: Thu Sep 23 16:59:44 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- full path to binary, added missing --pidfile options, s/test/checkconfig/,
  checkconfig before run, fixed exit code, quoted external variables, cosmetics

---- Files affected:
packages/tacacs:
   tacacs.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/tacacs/tacacs.init
diff -u packages/tacacs/tacacs.init:1.1 packages/tacacs/tacacs.init:1.2
--- packages/tacacs/tacacs.init:1.1	Tue Mar 30 15:03:21 2010
+++ packages/tacacs/tacacs.init	Thu Sep 23 18:59:39 2010
@@ -8,6 +8,8 @@
 # processname:	tac_plus
 # config:	/etc/tacacs/tacacs.cfg
 # pidfile:	/var/run/tacacs.pid
+#
+# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -30,22 +32,24 @@
 
 tacacs_config="/etc/tacacs/tacacs.cfg"
 
-[ -f $tacacs_config ] || exit 0
+[ -f "$tacacs_config" ] || exit 0
 
-if [ -z $TACACS_PORT ]; then
-    TACACS_PORT=49
+if [ -z "$TACACS_PORT" ]; then
+	TACACS_PORT=49
 fi
 
-if [ -z $TACACS_DEBUG_LEVEL ]; then
-    TACACS_DEBUG_LEVEL=0
+if [ -z "$TACACS_DEBUG_LEVEL" ]; then
+	TACACS_DEBUG_LEVEL=0
 fi
 
+RETVAL=0
 # See how we were called.
 case "$1" in
   start)
 	if [ ! -f /var/lock/subsys/tacacs ]; then
+		$0 checkconfig
 		msg_starting TACACS+
-		daemon tac_plus -C $tacacs_config  -d $TACACS_DEBUG_LEVEL -p $TACACS_PORT
+		daemon --pidfile /var/run/tac_plus.pid /usr/bin/tac_plus -C "$tacacs_config" -p "$TACACS_PORT" -d "$TACACS_DEBUG_LEVEL"
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/tacacs
 	else
@@ -55,8 +59,8 @@
   stop)
 	if [ -f /var/lock/subsys/tacacs ]; then
 		msg_stopping TACACS+
-		killproc tac_plus
-		rm -f /var/lock/subsys/tacacs
+		killproc --pidfile /var/run/tac_plus.pid tac_plus
+		rm -f /var/lock/subsys/tacacs /var/run/tac_plus.pid
 	else
 		msg_not_running TACACS+
 	fi
@@ -69,7 +73,6 @@
 	$0 stop
 	$0 start
 	;;
-
   reload)
 	if [ -f /var/lock/subsys/tacacs ]; then
 		msg_reloading TACACS+
@@ -79,13 +82,13 @@
 	fi
 	exit $?
 	;;
-  test)
+  checkconfig)
 	echo "TACACS+ config being testing"
-	/usr/bin/tac_plus -P -C $tacacs_config -p $TACACS_PORT
+	/usr/bin/tac_plus -P -C "$tacacs_config" -p "$TACACS_PORT"
 	;;
   *)
-	echo "Usage: %s {start|stop|status|restart|reload|test}"
+	echo "Usage: $0 {start|stop|restart|reload|status|checkconfig}"
 	exit 1
 esac
 
-exit 0
+exit $RETVAL
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tacacs/tacacs.init?r1=1.1&r2=1.2&f=u