tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-07 22:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debian: Fixed config check and changed DAEMON_ARGS in init script.

Browse Source 
Check now actually works, command was incorrect and not properly blocking the
actual action on fail.

Also the config file is now in DAEMON_CONFIG variable.

Fixes #5086
This commit is contained in:
Markus Frosch 2013-12-04 19:50:10 +01:00
parent 1399ac6047
commit 2b7e8ed7ab
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -17,7 +17,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="icinga2 monitoring daemon" DESC="icinga2 monitoring daemon"
NAME=icinga2 NAME=icinga2
DAEMON=/usr/sbin/icinga2 DAEMON=/usr/sbin/icinga2
DAEMON_ARGS="-c /etc/icinga2/icinga2.conf -e /var/log/icinga2/icinga2.err -d -u nagios -g nagios" DAEMON_CONFIG="/etc/icinga2/icinga2.conf"
DAEMON_ARGS="-e /var/log/icinga2/icinga2.err -d -u nagios -g nagios"
PIDFILE=/var/run/icinga2/$NAME.pid PIDFILE=/var/run/icinga2/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
@ -48,7 +49,10 @@ check_run () {
} }
check_config () { check_config () {
$DAEMON -C $DAEMON_ARGS if ! $DAEMON --validate -c "$DAEMON_CONFIG" >/dev/null 2>&1; then
# blark output
$DAEMON --validate -c "$DAEMON_CONFIG"
fi
} }
@ -64,7 +68,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 -- \
$DAEMON_ARGS \ -c "$DAEMON_CONFIG" $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
@ -118,6 +122,7 @@ case "$1" in
if ! check_config; then if ! check_config; then
log_failure_msg "config test failed!" log_failure_msg "config test failed!"
log_end_msg 1 log_end_msg 1
exit 1
fi fi
log_daemon_msg "Starting $DESC" "$NAME" log_daemon_msg "Starting $DESC" "$NAME"
@ -143,6 +148,7 @@ case "$1" in
if ! check_config; then if ! check_config; then
log_failure_msg "config test failed!" log_failure_msg "config test failed!"
log_end_msg 1 log_end_msg 1
exit 1
fi fi
log_daemon_msg "Reloading $DESC" "$NAME" log_daemon_msg "Reloading $DESC" "$NAME"
@ -154,6 +160,7 @@ case "$1" in
if ! check_config; then if ! check_config; then
log_failure_msg "config test failed!" log_failure_msg "config test failed!"
log_end_msg 1 log_end_msg 1
exit 1
fi fi
log_daemon_msg "Restarting $DESC" "$NAME" log_daemon_msg "Restarting $DESC" "$NAME"