cleanup

net-analyzer/shinken/files/shinken.confd

@@ -1,94 +1,88 @@
-# /etc/default/shinken
-
-## These vars will overRide the hardcoded ones in init script
-ETC=/etc/shinken
-VAR=/var/lib/shinken
-BIN=/usr/bin
+# /etc/conf.d/shinken 
 
 # location of the nagios configuration file
-SHINKENCFG="$ETC/nagios.cfg"
+SHINKENCFG="/etc/shinken/nagios.cfg"
 
 # We got 2 configs because tools like Centreon don't generate all
 #configuration (only the shinken.cfg part)
-SHINKENSPECIFICCFG="$ETC/shinken-specific.cfg"
+SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
 
 # The command to launch
-ARBITERDAEMON=$BIN/shinken-arbiter
+ARBITERDAEMON="/usr/bin/shinken-arbiter"
 
 #The ARBITER PID
 if [ -r $SHINKENCFG ] ; then
     tmppid=`grep 'lock_file=' $SHINKENCFG | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
-    ARBITERPID=${tmppid-$VAR/arbiterd.pid}
+    ARBITERPID=${tmppid-/var/lib/shinken/arbiterd.pid}
 else
-    ARBITERPID="$VAR/arbiterd.pid"
+    ARBITERPID="/var/lib/shinken/arbiterd.pid"
 fi
 
-ARBITERDEBUGFILE="$VAR/arbiter-debug.log"
+ARBITERDEBUGFILE="/var/lib/shinken/arbiter-debug.log"
 
 
 ###SCHEDULER PART
 # location of the scheduler daemon configuration
-SCHEDULERCFG="$ETC/schedulerd.ini"
+SCHEDULERCFG="/etc/shinken/schedulerd.ini"
 
 # The command to launch
-SCHEDULERDAEMON=$BIN/shinken-scheduler
+SCHEDULERDAEMON="/usr/bin/shinken-scheduler"
 
 #The SCHEDULER PID
-SCHEDULERPID="$VAR/schedulerd.pid"
+SCHEDULERPID="/var/lib/shinken/schedulerd.pid"
 
-SCHEDULERDEBUGFILE="$VAR/scheduler-debug.log"
+SCHEDULERDEBUGFILE="/var/lib/shinken/scheduler-debug.log"
 
 ###POLLER PART
 # location of the poller daemon configuration
-POLLERCFG="$ETC/pollerd.ini"
+POLLERCFG="/etc/shinken/pollerd.ini"
 
 # The command to launch
-POLLERDAEMON=$BIN/shinken-poller
+POLLERDAEMON="/usr/bin/shinken-poller"
 
 #The poller pid
-POLLERPID="$VAR/pollerd.pid"
+POLLERPID="/var/lib/shinken/pollerd.pid"
 
-POLLERDEBUGFILE="$VAR/poller-debug.log"
+POLLERDEBUGFILE="/var/lib/shinken/poller-debug.log"
 
 
 ###REACTIONNER PART
 # location of the reactionner daemon configuration
-REACTIONNERCFG="$ETC/reactionnerd.ini"
+REACTIONNERCFG="/etc/shinken/reactionnerd.ini"
 
 # The command to launch
-REACTIONNERDAEMON=$BIN/shinken-reactionner
+REACTIONNERDAEMON="/usr/bin/shinken-reactionner"
 
 #The reactionner pid
-REACTIONNERPID="$VAR/reactionnerd.pid"
+REACTIONNERPID="/var/lib/shinken/reactionnerd.pid"
 
-REACTIONNERDEBUGFILE="$VAR/reactionner-debug.log"
+REACTIONNERDEBUGFILE="/var/lib/shinken/reactionner-debug.log"
 
 
 ###BROKER PART
 # location of the broker daemon configuration
-BROKERCFG="$ETC/brokerd.ini"
+BROKERCFG="/etc/shinken/brokerd.ini"
 
 # The command to launch
-BROKERDAEMON=$BIN/shinken-broker
+BROKERDAEMON="/usr/bin/shinken-broker"
 
 #The broker pid
-BROKERPID="$VAR/brokerd.pid"
+BROKERPID="/var/lib/shinken/brokerd.pid"
 
-BROKERDEBUGFILE="$VAR/broker-debug.log"
+BROKERDEBUGFILE="/var/lib/shinken/broker-debug.log"
 
 
 ###RECEIVER PART
 # location of the broker daemon configuration
-RECEIVERCFG="$ETC/receiverd.ini"
+RECEIVERCFG="/etc/shinken/receiverd.ini"
 
 # The command to launch
-RECEIVERDAEMON=$BIN/shinken-receiver
+RECEIVERDAEMON="/usr/bin/shinken-receiver"
 
 #The broker pid
-RECEIVERPID="$VAR/receiverd.pid"
-
-RECEIVERDEBUGFILE="$VAR/receiver-debug.log"
+RECEIVERPID="/var/lib/shinken/receiverd.pid"
 
+RECEIVERDEBUGFILE="/var/lib/shinken/receiver-debug.log"
 
 # nicelevel to run nagios daemon with
 NICENESS=5

net-analyzer/shinken/files/shinken.initd

@@ -5,6 +5,8 @@
 
 MODULE=${SVCNAME#*.}
 _MODULE=$(echo $MODULE | awk '{print toupper($0)}')
+SHINKEN=${SHINKEN:-/usr/bin/shinken}
+PIDPATH=${PIDPATH:-/var/run/shinken}
 PIDFILE=${PIDPATH}/${MODULE}
 
 LANG=en_US.UTF8
@@ -16,6 +18,7 @@ SHINKENM="/usr/bin/shinken-${MODULE}"
 if [ $MODULE = "arbiter" ]; then
 	CONFIGFILE="${SHINKENCFG} --config ${SHINKENSPECIFICCFG}"
 fi
+NEED="net"
 PIDFILE=$(grep '^pidfile=' ${CONFIGFILE} | awk -F= '{ print $2 }')
 
 depend() {