From ba882079be1ad8a3cc74b04e725866fe9a153370 Mon Sep 17 00:00:00 2001 From: Jean Flach Date: Fri, 13 Apr 2018 13:03:12 +0200 Subject: [PATCH] Don't use shell variables in sysconfig fixes #6214 --- etc/initsystem/icinga2.sysconfig.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/initsystem/icinga2.sysconfig.cmake b/etc/initsystem/icinga2.sysconfig.cmake index 7daf305be..a8335b4eb 100644 --- a/etc/initsystem/icinga2.sysconfig.cmake +++ b/etc/initsystem/icinga2.sysconfig.cmake @@ -2,12 +2,12 @@ DAEMON=@CMAKE_INSTALL_FULL_SBINDIR@/icinga2 ICINGA2_CONFIG_FILE=@CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga2/icinga2.conf ICINGA2_RUN_DIR=@ICINGA2_RUNDIR@ ICINGA2_STATE_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@ -ICINGA2_PID_FILE=$ICINGA2_RUN_DIR/icinga2/icinga2.pid +ICINGA2_PID_FILE=@ICINGA2_RUNDIR@/icinga2/icinga2.pid ICINGA2_LOG_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2 -ICINGA2_ERROR_LOG=$ICINGA2_LOG_DIR/error.log -ICINGA2_STARTUP_LOG=$ICINGA2_LOG_DIR/startup.log -ICINGA2_LOG=$ICINGA2_LOG_DIR/icinga2.log -ICINGA2_CACHE_DIR=$ICINGA2_STATE_DIR/cache/icinga2 +ICINGA2_ERROR_LOG=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/error.log +ICINGA2_STARTUP_LOG=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/startup.log +ICINGA2_LOG=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/icinga2.log +ICINGA2_CACHE_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/cache/icinga2 ICINGA2_USER=@ICINGA2_USER@ ICINGA2_GROUP=@ICINGA2_GROUP@ ICINGA2_COMMAND_GROUP=@ICINGA2_COMMAND_GROUP@ -- 2.40.0