From 7183495d8959621d6eb1209959d47e77e3ffd1a5 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 26 May 2014 09:01:23 +0200 Subject: [PATCH] Make username in the logrotate config configurable. Fixes #6295 --- etc/CMakeLists.txt | 5 +++-- etc/logrotate.d/{icinga2 => icinga2.cmake} | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) rename etc/logrotate.d/{icinga2 => icinga2.cmake} (55%) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt index 79f1b260f..474fef199 100644 --- a/etc/CMakeLists.txt +++ b/etc/CMakeLists.txt @@ -17,7 +17,8 @@ include(InstallConfig) -configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga/icinga-classic-apache.conf) +configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga/icinga-classic-apache.conf @ONLY) +configure_file(logrotate.d/icinga2.cmake ${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 @ONLY) install_if_not_exists(icinga2/icinga2.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) install_if_not_exists(icinga2/constants.conf ${CMAKE_INSTALL_SYSCONFDIR}/icinga2) @@ -57,7 +58,7 @@ install_if_not_exists(icinga2/scripts/check_kernel ${CMAKE_INSTALL_SYSCONFDIR}/i install_if_not_exists(icinga2/scripts/mail-host-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) install_if_not_exists(icinga2/scripts/mail-service-notification.sh ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/scripts) install_if_not_exists(icinga2/zones.d/README ${CMAKE_INSTALL_SYSCONFDIR}/icinga2/zones.d) -install_if_not_exists(logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d) +install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d) install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/pki\")") diff --git a/etc/logrotate.d/icinga2 b/etc/logrotate.d/icinga2.cmake similarity index 55% rename from etc/logrotate.d/icinga2 rename to etc/logrotate.d/icinga2.cmake index b843e90f9..5aa1ff9da 100644 --- a/etc/logrotate.d/icinga2 +++ b/etc/logrotate.d/icinga2.cmake @@ -1,11 +1,11 @@ -/var/log/icinga2/icinga2.log /var/log/icinga2/debug.log { +@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/icinga2.log @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/debug.log { daily rotate 7 compress delaycompress missingok notifempty - create 644 icinga icinga + create 644 @ICINGA2_USER@ @ICINGA2_GROUP@ copytruncate postrotate if ! killall -q -USR1 icinga2; then @@ -14,14 +14,14 @@ endscript } -/var/log/icinga2/error.log { +@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/icinga2/error.log { daily rotate 90 compress delaycompress missingok notifempty - create 644 icinga icinga + create 644 @ICINGA2_USER@ @ICINGA2_GROUP@ copytruncate # TODO: figure out how to get Icinga to re-open this log file } -- 2.40.0