new version shinken-1.0.1 (much cleaner)

net-analyzer/shinken/files/shinken.confd

@@ -1,7 +1,7 @@
 # /etc/conf.d/shinken 
 
 # location of the nagios configuration file
-SHINKENCFG="/etc/shinken/nagios.cfg"
+ARBITERCFG="/etc/shinken/nagios.cfg"
 
 # We got 2 configs because tools like Centreon don't generate all
 #configuration (only the shinken.cfg part)
@@ -11,14 +11,9 @@ SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
 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/lib/shinken/arbiterd.pid}
-else
-    ARBITERPID="/var/lib/shinken/arbiterd.pid"
-fi
+ARBITERPID="/var/run/shinken/arbiterd.pid"
 
-ARBITERDEBUGFILE="/var/lib/shinken/arbiter-debug.log"
+ARBITERDEBUGFILE="/var/log/shinken/arbiter-debug.log"
 
 
 ###SCHEDULER PART
@@ -29,9 +24,9 @@ SCHEDULERCFG="/etc/shinken/schedulerd.ini"
 SCHEDULERDAEMON="/usr/bin/shinken-scheduler"
 
 #The SCHEDULER PID
-SCHEDULERPID="/var/lib/shinken/schedulerd.pid"
+SCHEDULERPID="/var/run/shinken/schedulerd.pid"
 
-SCHEDULERDEBUGFILE="/var/lib/shinken/scheduler-debug.log"
+SCHEDULERDEBUGFILE="/var/log/shinken/scheduler-debug.log"
 
 ###POLLER PART
 # location of the poller daemon configuration
@@ -41,9 +36,9 @@ POLLERCFG="/etc/shinken/pollerd.ini"
 POLLERDAEMON="/usr/bin/shinken-poller"
 
 #The poller pid
-POLLERPID="/var/lib/shinken/pollerd.pid"
+POLLERPID="/var/run/shinken/pollerd.pid"
 
-POLLERDEBUGFILE="/var/lib/shinken/poller-debug.log"
+POLLERDEBUGFILE="/var/log/shinken/poller-debug.log"
 
 
 ###REACTIONNER PART
@@ -54,9 +49,9 @@ REACTIONNERCFG="/etc/shinken/reactionnerd.ini"
 REACTIONNERDAEMON="/usr/bin/shinken-reactionner"
 
 #The reactionner pid
-REACTIONNERPID="/var/lib/shinken/reactionnerd.pid"
+REACTIONNERPID="/var/run/shinken/reactionnerd.pid"
 
-REACTIONNERDEBUGFILE="/var/lib/shinken/reactionner-debug.log"
+REACTIONNERDEBUGFILE="/var/log/shinken/reactionner-debug.log"
 
 
 ###BROKER PART
@@ -67,9 +62,9 @@ BROKERCFG="/etc/shinken/brokerd.ini"
 BROKERDAEMON="/usr/bin/shinken-broker"
 
 #The broker pid
-BROKERPID="/var/lib/shinken/brokerd.pid"
+BROKERPID="/var/run/shinken/brokerd.pid"
 
-BROKERDEBUGFILE="/var/lib/shinken/broker-debug.log"
+BROKERDEBUGFILE="/var/log/shinken/broker-debug.log"
 
 
 ###RECEIVER PART
@@ -80,9 +75,9 @@ RECEIVERCFG="/etc/shinken/receiverd.ini"
 RECEIVERDAEMON="/usr/bin/shinken-receiver"
 
 #The broker pid
-RECEIVERPID="/var/lib/shinken/receiverd.pid"
+RECEIVERPID="/var/run/shinken/receiverd.pid"
 
-RECEIVERDEBUGFILE="/var/lib/shinken/receiver-debug.log"
+RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log"
 
 # nicelevel to run nagios daemon with
 NICENESS=5

net-analyzer/shinken/files/shinken.initd

@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,16 +10,21 @@ PIDPATH=${PIDPATH:-/var/run/shinken}
 PIDFILE=${PIDPATH}/${MODULE}
 
 LANG=en_US.UTF8
-opts="${opts} check"
+extra_commands="check"
 eval DEBUGFILE="\${${_MODULE}DEBUGFILE}"
 eval CONFIGFILE="\${${_MODULE}CFG}"
 eval PIDFILE="\${${_MODULE}PID}"
 SHINKENM="/usr/bin/shinken-${MODULE}"
-if [ $MODULE = "arbiter" ]; then
-	CONFIGFILE="${SHINKENCFG} --config ${SHINKENSPECIFICCFG}"
-fi
 NEED="net"
-PIDFILE=$(grep '^pidfile=' ${CONFIGFILE} | awk -F= '{ print $2 }')
+
+if [ -r "${CONFIGFILE}" ] ; then
+	tmppid=`grep 'pidfile=' ${CONFIGFILE} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
+	PIDFILE=${tmppid:-$PIDFILE}
+fi
+
+if [ $MODULE = "arbiter" ]; then
+	CONFIGFILE="${CONFIGFILE} --config ${SHINKENSPECIFICCFG}"
+fi
 
 depend() {
 	need net
@@ -30,8 +35,8 @@ start() {
 		ebegin "all shinken-services started" 
 		return 0
 	fi
-	ebegin "starting shinken ${MODULE}"
- 	start-stop-daemon --start --exec ${SHINKENM} --pidfile ${PIDFILE} \
+	ebegin "Starting shinken ${MODULE}"
+ 	start-stop-daemon --start --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} \
 	   -- --config ${CONFIGFILE} --daemon
 	eend $?
 }
@@ -42,11 +47,11 @@ stop() {
 		return 0
 	fi
 	ebegin "Stopping shinken ${MODULE}"
-	start-stop-daemon --stop --exec ${SHINKENM} --pidfile ${PIDFILE} 
+	start-stop-daemon --stop --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} 
 	eend $?
 }
 
 check() {
-	"$BIN/shinken-arbiter" -v -c "$SHINKENCFG" -c "$SHINKENSPECIFICCFG" $DEBUGCMD 2>&1
+	"/usr/bin/shinken-arbiter" -v --config "${ARBITERCFG}" --config "${SHINKENSPECIFICCFG}" $DEBUGCMD 2>&1
 	return $?
 }