upstream/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2026-06-09 08:42:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c42dc1e55a into f63bbec4ab

Browse source
This commit is contained in:
Julian Brost 2026-05-22 09:35:41 -04:00 committed by GitHub
commit 1417dba7fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
CMakeLists.txt
View file

@ -154,25 +154,6 @@ if(WIN32)
endif()
endif()
if(NOT DEFINED LOGROTATE_HAS_SU)
set(LOGROTATE_HAS_SU OFF)
find_program(LOGROTATE_BINARY logrotate)
execute_process(COMMAND ${LOGROTATE_BINARY} ERROR_VARIABLE LOGROTATE_OUTPUT)
if(LOGROTATE_OUTPUT)
string(REGEX REPLACE "^logrotate ([0-9.]*).*" "\\1" LOGROTATE_VERSION
${LOGROTATE_OUTPUT})
message(STATUS "Found logrotate (found version \"${LOGROTATE_VERSION}\")")
if("${LOGROTATE_VERSION}" VERSION_GREATER "3.7.9")
set(LOGROTATE_HAS_SU ON)
endif()
endif()
endif()
if(LOGROTATE_HAS_SU)
set(LOGROTATE_USE_SU "\n\tsu ${ICINGA2_USER} ${ICINGA2_GROUP}")
else()
set(LOGROTATE_CREATE "\n\tcreate 644 ${ICINGA2_USER} ${ICINGA2_GROUP}")
endif()
find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS coroutine context date_time filesystem iostreams thread program_options regex REQUIRED)
# Boost.Coroutine2 (the successor of Boost.Coroutine)

10
etc/logrotate.d/icinga2.cmake
View file

@ -1,10 +1,11 @@
@ICINGA2_LOGDIR@/icinga2.log @ICINGA2_LOGDIR@/debug.log {
daily
rotate 7@LOGROTATE_USE_SU@
rotate 7
su @ICINGA2_USER@ @ICINGA2_GROUP@
compress
delaycompress
missingok
notifempty@LOGROTATE_CREATE@
notifempty
postrotate
@CMAKE_INSTALL_FULL_SBINDIR@/icinga2 internal signal --sig SIGUSR1 --pid "$(cat @ICINGA2_INITRUNDIR@/icinga2.pid 2> /dev/null)" 2> /dev/null || true
endscript
@ -12,10 +13,11 @@
@ICINGA2_LOGDIR@/error.log {
daily
rotate 90@LOGROTATE_USE_SU@
rotate 90
su @ICINGA2_USER@ @ICINGA2_GROUP@
compress
delaycompress
missingok
notifempty@LOGROTATE_CREATE@
notifempty
# TODO: figure out how to get Icinga to re-open this log file
}