]> granicus.if.org Git - icinga2/commitdiff
Merge pull request #7065 from uubk/logrotate-fix
authorMichael Friedrich <michael.friedrich@icinga.com>
Mon, 8 Jul 2019 07:47:18 +0000 (09:47 +0200)
committerGitHub <noreply@github.com>
Mon, 8 Jul 2019 07:47:18 +0000 (09:47 +0200)
Fix logrotate "Operation not permitted"

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
index ac57471fd98ff302b15aa7a1bc137fdb150c699a,338f885c445139876967d236cc234f644e39c1d5..ac6151796d4cbeba6c94f2109b3747f8ee8e6caf
@@@ -148,16 -130,11 +148,18 @@@ if(NOT DEFINED LOGROTATE_HAS_SU
  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 thread system program_options regex REQUIRED)
 +find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS context coroutine date_time filesystem thread system program_options regex REQUIRED)
 +
 +# Boost.Coroutine2 (the successor of Boost.Coroutine)
 +# (1) doesn't even exist in old Boost versions and
 +# (2) isn't supported by ASIO, yet.
 +add_definitions(-DBOOST_COROUTINES_NO_DEPRECATION_WARNING)
 +
 +add_definitions(-DBOOST_FILESYSTEM_NO_DEPRECATED)
  
  link_directories(${Boost_LIBRARY_DIRS})
  include_directories(${Boost_INCLUDE_DIRS})