SOURCES: bandersnatch.init, bandersnatch.sysconfig - support both ...

[arekm]

Author: arekm                        Date: Wed Sep 21 08:23:16 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- support both bandersnatch versions

---- Files affected:
SOURCES:
   bandersnatch.init (1.1 -> 1.2) , bandersnatch.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/bandersnatch.init
diff -u SOURCES/bandersnatch.init:1.1 SOURCES/bandersnatch.init:1.2
--- SOURCES/bandersnatch.init:1.1	Wed Sep 21 10:05:51 2005
+++ SOURCES/bandersnatch.init	Wed Sep 21 10:23:11 2005
@@ -5,9 +5,6 @@
 # chkconfig:	345 99 01
 # description:	bandersnatch is a jabber logger
 #		
-# processname:	bandersnatch
-# config:	
-# pidfile:
 
 # Source function library.
 . /etc/rc.d/init.d/functions
@@ -15,6 +12,7 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
+BANDERSNATCH_JABBER=2
 . /etc/sysconfig/bandersnatch
 
 # Check that networking is up.
@@ -34,7 +32,7 @@
 	# Start daemons.
 	if [ ! -f /var/lock/subsys/bandersnatch ]; then
 		msg_starting bandersnatch
-		daemon bandersnatch /etc/bandersnatch/bandersnatch.xml
+		daemon bandersnatch${BANDERSNATCH_JABBER} /etc/bandersnatch/bandersnatch.xml
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bandersnatch
 	else
@@ -45,7 +43,7 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/bandersnatch ]; then
 		msg_stopping bandersnatch
-		killproc bandersnatch
+		killproc bandersnatch${BANDERSNATCH_JABBER}
 		rm -f /var/lock/subsys/bandersnatch >/dev/null 2>&1
 	else
 		msg_not_running bandersnatch
@@ -57,7 +55,7 @@
 	exit $?
 	;;
   status)
-	status bandersnatch
+	status bandersnatch${BANDERSNATCH_JABBER}
 	exit $?
 	;;
   *)

================================================================
Index: SOURCES/bandersnatch.sysconfig
diff -u SOURCES/bandersnatch.sysconfig:1.1 SOURCES/bandersnatch.sysconfig:1.2
--- SOURCES/bandersnatch.sysconfig:1.1	Wed Sep 21 10:05:51 2005
+++ SOURCES/bandersnatch.sysconfig	Wed Sep 21 10:23:11 2005
@@ -1,2 +1,5 @@
 # Nice level
 SERVICE_RUN_NICE_LEVEL="+5"
+
+# jabber 1 or 2
+BANDERSNATCH_JABBER="2"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bandersnatch.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/bandersnatch.sysconfig?r1=1.1&r2=1.2&f=u