]> granicus.if.org Git - icinga2/commitdiff
Don't use shell variables in sysconfig 6229/head
authorJean Flach <jean-marcel.flach@icinga.com>
Fri, 13 Apr 2018 11:03:12 +0000 (13:03 +0200)
committerJean Flach <jean-marcel.flach@icinga.com>
Fri, 13 Apr 2018 11:03:12 +0000 (13:03 +0200)
fixes #6214

etc/initsystem/icinga2.sysconfig.cmake

index 7daf305be5cfa0af679aa044f27b633dc6e0e328..a8335b4eb6939fa5221a1429d6a9fd06152e93ce 100644 (file)
@@ -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@