Fix certificate paths for installers

refs #5450

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index 68abbf73e69649527c8fc915e5cb1c42a8f57069..94d1f2133455cd621f59fc58d28ada8eb45abae4 100644 (file)
--- 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 aa5666dd853a4959fdef82092da393a32f12b447..438ddc37db7eba7ddc1a0f8299293ef382ba918d 100644 (file)
--- 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 29bdf39730396e9013d1d8522f0b00c8e40c84e4..3cea135e4ce72114b52b5e37b0403d81b071fcf1 100644 (file)
--- 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\")")