- support both bandersnatch versions

Changed files:
    bandersnatch.init -> 1.2
    bandersnatch.sysconfig -> 1.2

diff --git a/bandersnatch.init b/bandersnatch.init
index 5f4f5cee62aa185db0d23ca99be211e2b80e3e62..5b48ea08f72be6a14e475ae573095a4ed17804e7 100644 (file)
--- a/bandersnatch.init
+++ b/bandersnatch.init
@@ -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 @@ case "$1" in
        # 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 @@ case "$1" in
        # 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 @@ case "$1" in
        exit $?
        ;;
   status)
-       status bandersnatch
+       status bandersnatch${BANDERSNATCH_JABBER}
        exit $?
        ;;
   *)

diff --git a/bandersnatch.sysconfig b/bandersnatch.sysconfig
index 2e6fdd5121b39902d138f0db5bc159007215654a..ef25c3cfa36a4eda4f31701f44d52acc2de54b95 100644 (file)
--- a/bandersnatch.sysconfig
+++ b/bandersnatch.sysconfig
@@ -1,2 +1,5 @@
 # Nice level
 SERVICE_RUN_NICE_LEVEL="+5"
+
+# jabber 1 or 2
+BANDERSNATCH_JABBER="2"