update shinken-2.4.3

net-analyzer/shinken/files/shinken.confd

@@ -1,11 +1,15 @@
-# /etc/conf.d/shinken 
+# /etc/conf.d/shinken
 
 # location of the nagios configuration file
-ARBITERCFG="/etc/shinken/nagios.cfg"
+
+SHINKENCFG="/etc/shinken/shinken.cfg"
 
 # We got 2 configs because tools like Centreon don't generate all
 #configuration (only the shinken.cfg part)
-SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
+#SHINKENSPECIFICCFG="/etc/shinken/shinken-specific.cfg"
+
+
+ARBITERCFG="/etc/shinken/arbiters/arbiter-master.cfg"
 
 # The command to launch
 ARBITERDAEMON="/usr/bin/shinken-arbiter"
@@ -56,7 +60,7 @@ REACTIONNERDEBUGFILE="/var/log/shinken/reactionner-debug.log"
 
 ###BROKER PART
 # location of the broker daemon configuration
-BROKERCFG="/etc/shinken/brokerd.ini"
+BROKERCFG="/etc/shinken/daemons/brokerd.ini"
 
 # The command to launch
 BROKERDAEMON="/usr/bin/shinken-broker"
@@ -69,7 +73,7 @@ BROKERDEBUGFILE="/var/log/shinken/broker-debug.log"
 
 ###RECEIVER PART
 # location of the broker daemon configuration
-RECEIVERCFG="/etc/shinken/receiverd.ini"
+RECEIVERCFG="/etc/shinken/daemons/receiverd.ini"
 
 # The command to launch
 RECEIVERDAEMON="/usr/bin/shinken-receiver"
@@ -79,7 +83,10 @@ RECEIVERPID="/var/run/shinken/receiverd.pid"
 
 RECEIVERDEBUGFILE="/var/log/shinken/receiver-debug.log"
 
-# nicelevel to run nagios daemon with
+# nicelevel to run shinken daemon with
 NICENESS=5
 
-SHINKENSERVICES=""
+# user/group for the var/run rights
+#SHINKENUSER=shinken
+#SHINKENGROUP=shinken
+#HOME=`grep ^$SHINKENUSER: /etc/passwd | cut -d: -f 6`

net-analyzer/shinken/files/shinken.initd

@@ -1,28 +1,30 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-MODULE=${SVCNAME#*.}
-_MODULE=$(echo $MODULE | awk '{print toupper($0)}')
-SHINKEN=${SHINKEN:-/usr/bin/shinken}
+MODULE="xxMODULExx"
 PIDPATH=${PIDPATH:-/var/run/shinken}
 PIDFILE=${PIDPATH}/${MODULE}
 
-LANG=en_US.UTF8
+source /etc/conf.d/shinken
+
+SHINKENUSER=${SHINKENUSER:-shinken}
+SHINKENGROUP=${SHINKENGROUP:-shinken}
+
+export LANG=en_US.UTF8
+export LC_ALL=en_US.UTF8
+export PYTHONIOENCODING=utf8
+export PYTHONUNBUFFERED="0"
+export TZ=:/etc/localtime
+# also unset http proxy, because pycurl is using it and this is bad, very bad :)
+unset http_proxy
+unset https_proxy
 extra_commands="check"
-eval DEBUGFILE="\${${_MODULE}DEBUGFILE}"
-eval CONFIGFILE="\${${_MODULE}CFG}"
-eval PIDFILE="\${${_MODULE}PID}"
-SHINKENM="/usr/bin/shinken-${MODULE}"
 
-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}"
+if [ -r "${XXUMODXXCFG}" ] ; then
+	tmppid=`grep 'pidfile=' ${XXUMODXXCFG} | grep -v '#' | tail -n 1 | awk -F '=' '{print $2}'`
+	XXUMODXXPID=${tmppid:-$XXUMODXXPID}
 fi
 
 depend() {
@@ -34,12 +36,15 @@ depend() {
 
 start() {
 	if [ $SVCNAME = "shinken" ]; then
-		ebegin "all shinken-services started" 
+		ebegin "all shinken-services started"
 		return 0
 	fi
-	ebegin "Starting shinken ${MODULE}"
- 	start-stop-daemon --start --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} \
-	   -- --config ${CONFIGFILE} --daemon
+	ebegin "Starting shinken xxMODULExx"
+
+	## --user ${SHINKENUSER}:${SHINKENGROUP} \
+ 	start-stop-daemon --start \
+	   --exec /usr/bin/shinken-xxMODULExx --quiet \
+	   --pidfile ${XXUMODXXPID} -- --config=${XXUMODXXCFG} --daemon
 	eend $?
 }
 
@@ -48,15 +53,16 @@ stop() {
 		ebegin "all shinken-services stopped"
 		return 0
 	fi
-	ebegin "Stopping shinken ${MODULE}"
-	start-stop-daemon --stop --exec ${SHINKENM} --quiet --pidfile ${PIDFILE} 
+	ebegin "Stopping shinken xxMODULExx"
+	start-stop-daemon --stop --exec /usr/bin/shinken-xxMODULExx --quiet \
+	   --pidfile ${XXUMODXXPID}
 	eend $?
 }
 
 check() {
-	"/usr/bin/shinken-arbiter" -v --config "${ARBITERCFG}" --config "${SHINKENSPECIFICCFG}" $DEBUGCMD 2>&1
+	/usr/bin/shinken-arbiter -v --config="${ARBITERCFG}" \
+	   --config="${SHINKENCFG}" $DEBUGCMD 2>&1
 	return $?
 }
 
 # vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
-