tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Debian: Added DAEMON_(USER|GROUP) to init/default for config checking. 

Config should be checked with the actual uid/gid Icinga 2 will run under.

Also moved "-d" to the actual start-stop-daemon call.

Fixes #5299
This commit is contained in:
Markus Frosch 2013-12-11 14:43:27 +01:00
parent c410ca0b54
commit 4c8f1f3d9d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/icinga2-common.icinga2.default vendored
View File

@ -1,4 +1,6 @@
# default settings for icinga2's initscript # default settings for icinga2's initscript
#DAEMON_CONFIG="/etc/icinga2/icinga2.conf" #DAEMON_CONFIG="/etc/icinga2/icinga2.conf"
#DAEMON_ARGS="-e /var/log/icinga2/icinga2.err -d -u nagios -g nagios" #DAEMON_USER=nagios
#DAEMON_GROUP=nagios
#DAEMON_ARGS="-e /var/log/icinga2/icinga2.err"

14
debian/icinga2-common.icinga2.init vendored
View File

@ -18,7 +18,9 @@ DESC="icinga2 monitoring daemon"
NAME=icinga2 NAME=icinga2
DAEMON=/usr/sbin/icinga2 DAEMON=/usr/sbin/icinga2
DAEMON_CONFIG="/etc/icinga2/icinga2.conf" DAEMON_CONFIG="/etc/icinga2/icinga2.conf"
DAEMON_ARGS="-e /var/log/icinga2/icinga2.err -d -u nagios -g nagios" DAEMON_USER=nagios
DAEMON_GROUP=nagios
DAEMON_ARGS="-e /var/log/icinga2/icinga2.err"
PIDFILE=/var/run/icinga2/$NAME.pid PIDFILE=/var/run/icinga2/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
@ -49,10 +51,10 @@ check_run () {
} }
check_config () { check_config () {
if ! $DAEMON --validate -c "$DAEMON_CONFIG" >/dev/null 2>&1; then if ! $DAEMON --validate -u "$DAEMON_USER" -g "$DAEMON_GROUP" -c "$DAEMON_CONFIG" >/dev/null 2>&1; then
# blark output # blark output
$DAEMON --validate -c "$DAEMON_CONFIG" $DAEMON --validate -u "$DAEMON_USER" -g "$DAEMON_GROUP" -c "$DAEMON_CONFIG"
fi fi
} }
@ -68,7 +70,7 @@ do_start()
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
|| return 1 || return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-c "$DAEMON_CONFIG" $DAEMON_ARGS \ -c "$DAEMON_CONFIG" -u "$DAEMON_USER" -g "$DAEMON_GROUP" -d $DAEMON_ARGS \
|| return 2 || return 2
# Add code here, if necessary, that waits for the process to be ready # Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend # to handle requests from services started subsequently which depend