From 953d840cc149f05a7a80fd3ff6c2b09e0c6ae895 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 22 Sep 2017 15:00:45 +0200 Subject: [PATCH] Fix certificate paths for installers refs #5450 --- etc/CMakeLists.txt | 2 -- icinga-installer/icinga-installer.cpp | 3 ++- lib/remote/CMakeLists.txt | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt index 68abbf73e..94d1f2133 100644 --- a/etc/CMakeLists.txt +++ b/etc/CMakeLists.txt @@ -67,8 +67,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") install_if_not_exists(${CMAKE_CURRENT_BINARY_DIR}/logrotate.d/icinga2 ${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d) endif() -install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/pki\")") - if(NOT WIN32) install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/features-enabled\")") install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ../features-available/mainlog.conf \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SYSCONFDIR}/icinga2/features-enabled/mainlog.conf\")") diff --git a/icinga-installer/icinga-installer.cpp b/icinga-installer/icinga-installer.cpp index aa5666dd8..438ddc37d 100644 --- a/icinga-installer/icinga-installer.cpp +++ b/icinga-installer/icinga-installer.cpp @@ -246,7 +246,8 @@ static int InstallIcinga(void) MkDirP(dataDir + "/etc/icinga2/pki"); MkDirP(dataDir + "/var/cache/icinga2"); - MkDirP(dataDir + "/var/lib/icinga2/pki"); + MkDirP(dataDir + "/var/lib/icinga2/certs"); + MkDirP(dataDir + "/var/lib/icinga2/certificate-requests"); MkDirP(dataDir + "/var/lib/icinga2/agent/inventory"); MkDirP(dataDir + "/var/lib/icinga2/api/config"); MkDirP(dataDir + "/var/lib/icinga2/api/log"); diff --git a/lib/remote/CMakeLists.txt b/lib/remote/CMakeLists.txt index 29bdf3973..3cea135e4 100644 --- a/lib/remote/CMakeLists.txt +++ b/lib/remote/CMakeLists.txt @@ -67,5 +67,7 @@ endif() #install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/icinga2/api\")") install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/icinga2/api/log\")") install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/icinga2/api/zones\")") +install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/icinga2/certs\")") +install(CODE "file(MAKE_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/icinga2/certificate-requests\")") -- 2.50.1