Fix sysconfig not bein handled correctly by sysvinit

This commit is contained in:
Jean Flach 2018-06-15 17:04:28 +02:00
parent 0f1715332a
commit 2b5ea38217
3 changed files with 14 additions and 2 deletions

View File

@ -60,7 +60,7 @@ fi
# Start Icinga 2
start() {
printf "Starting Icinga 2: "
@CMAKE_INSTALL_PREFIX@/lib/icinga2/prepare-dirs
@CMAKE_INSTALL_PREFIX@/lib/icinga2/prepare-dirs "$SYSCONFIGFILE"
if ! $DAEMON daemon -c $ICINGA2_CONFIG_FILE -d -e $ICINGA2_ERROR_LOG > $ICINGA2_STARTUP_LOG 2>&1; then
echo "Error starting Icinga. Check '$ICINGA2_STARTUP_LOG' for details."
@ -105,7 +105,7 @@ stop() {
# Reload Icinga 2
reload() {
exec @CMAKE_INSTALL_PREFIX@/lib/icinga2/safe-reload $SYSCONFIGFILE
exec @CMAKE_INSTALL_PREFIX@/lib/icinga2/safe-reload "$SYSCONFIGFILE"
}
# Check the Icinga 2 configuration

View File

@ -3,6 +3,11 @@
# This script prepares directories and files needed for running Icinga2
#
# With sysvinit we need to pass the environment this way. Or do we?
if [ "$1" != "" ]; then
source "$1"
fi
# Set defaults, to overwrite see "@ICINGA2_SYSCONFIGFILE@"
: ${ICINGA2_USER:="@ICINGA2_USER@"}

View File

@ -1,5 +1,12 @@
#!/bin/sh
# With sysvinit we need to pass the environment this way. Or do we?
if [ "$1" != "" ]; then
source "$1"
fi
# Set defaults, to overwrite see "@ICINGA2_SYSCONFIGFILE@"
: ${ICINGA2_PID_FILE:="@ICINGA2_RUNDIR@/icinga2/icinga2.pid"}
: ${DAEMON:="@CMAKE_INSTALL_FULL_SBINDIR@/icinga2"}