Skip to content

CMake: remove logrotate version detection #10540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

CMake: remove logrotate version detection #10540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,25 +153,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)
Expand Down
10 changes: 6 additions & 4 deletions etc/logrotate.d/icinga2.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
@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
/bin/kill -USR1 $(cat @ICINGA2_INITRUNDIR@/icinga2.pid 2> /dev/null) 2> /dev/null || true
endscript
}

@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
}
Loading