Make username in the logrotate config configurable.

Fixes #6295

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 79f1b260f31730811c613daa91a9fa0d62f47057..474fef199cb9fc696b6ade203333f78e0eab1998 100644 (file)
--- 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 b843e90f94e456ea295303e650dd881da3759179..5aa1ff9dae482f5747e74265b50bffc5e519058e 100644 (file)
--- 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
 }