Change directory layout to /var/lib/icinga2/{ca,certs,certificate_requests}

refs #5450

diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index 35b63a2b1aaa0d36b959797766b75c1b4e9af213..b658f9339937691b0cc892ebe9989da0a48664af 100644 (file)
--- a/lib/cli/apisetuputility.cpp
+++ b/lib/cli/apisetuputility.cpp
@@ -69,7 +69,7 @@ bool ApiSetupUtility::SetupMasterCertificates(const String& cn)
        if (PkiUtility::NewCa() > 0)
                Log(LogWarning, "cli", "Found CA, skipping and using the existing one.");
 
-       String pki_path = ApiListener::GetPkiDir();
+       String pki_path = ApiListener::GetCertsDir();
        Utility::MkDirP(pki_path, 0700);
 
        String user = ScriptGlobal::Get("RunAsUser");

diff --git a/lib/cli/casigncommand.cpp b/lib/cli/casigncommand.cpp
index a61bb2cc75fb1e483be2afb8c232ac1f9e81f7b9..e260612382ceae6002a5de95383e9ae3cf270625 100644 (file)
--- a/lib/cli/casigncommand.cpp
+++ b/lib/cli/casigncommand.cpp
@@ -54,7 +54,7 @@ ImpersonationLevel CASignCommand::GetImpersonationLevel(void) const
  */
 int CASignCommand::Run(const boost::program_options::variables_map& vm, const std::vector<std::string>& ap) const
 {
-       String requestFile = ApiListener::GetPkiRequestsDir() + "/" + ap[0] + ".json";
+       String requestFile = ApiListener::GetCertificateRequestsDir() + "/" + ap[0] + ".json";
 
        if (!Utility::PathExists(requestFile)) {
                Log(LogCritical, "cli")

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index e02e9f6da91e884d79edd3613fb0d5bfb5e0123f..895815d994b6edca543bd4471e2ded8ac6d3c142 100644 (file)
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -131,7 +131,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
                 cn = vm["cn"].as<std::string>();
 
        /* check whether the user wants to generate a new certificate or not */
-       String existing_path = ApiListener::GetPkiDir() + "/" + cn + ".crt";
+       String existing_path = ApiListener::GetCertsDir() + "/" + cn + ".crt";
 
        Log(LogInformation, "cli")
            << "Checking for existing certificates for common name '" << cn << "'...";
@@ -306,7 +306,7 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
 
        /* pki request a signed certificate from the master */
 
-       String pki_path = ApiListener::GetPkiDir();
+       String pki_path = ApiListener::GetCertsDir();
        Utility::MkDirP(pki_path, 0700);
 
        String user = ScriptGlobal::Get("RunAsUser");
@@ -441,7 +441,7 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
        NodeUtility::UpdateConstant("NodeName", cn);
        NodeUtility::UpdateConstant("ZoneName", vm["zone"].as<std::string>());
 
-       String ticketPath = ApiListener::GetPkiDir() + "/ticket";
+       String ticketPath = ApiListener::GetCertsDir() + "/ticket";
 
        String tempTicketPath = Utility::CreateTempFile(ticketPath + ".XXXXXX", 0600, fp);
 

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index fd841af21835021744e8630fb5271af10cb2e555..91e89b6212f05e4dd593d1676857431d2e845f49 100644 (file)
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -230,7 +230,7 @@ wizard_endpoint_loop_start:
                }
 
                /* workaround for fetching the master cert */
-               String pki_path = ApiListener::GetPkiDir();
+               String pki_path = ApiListener::GetCertsDir();
                Utility::MkDirP(pki_path, 0700);
 
                String user = ScriptGlobal::Get("RunAsUser");
@@ -498,7 +498,7 @@ wizard_ticket:
                cn = cn.Trim();
 
                /* check whether the user wants to generate a new certificate or not */
-               String existing_path = ApiListener::GetPkiDir() + "/" + cn + ".crt";
+               String existing_path = ApiListener::GetCertsDir() + "/" + cn + ".crt";
 
                std::cout << ConsoleColorTag(Console_Normal)
                    << "Checking for existing certificates for common name '" << cn << "'...\n";

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index e3a25b8f4c2ec5841705b6ebbf780df4792f68b0..2f00d6da62c9d98134e09295271821380326f62d 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -60,9 +60,9 @@ String ApiListener::GetApiDir(void)
        return Application::GetLocalStateDir() + "/lib/icinga2/api/";
 }
 
-String ApiListener::GetPkiDir(void)
+String ApiListener::GetCertsDir(void)
 {
-       return Application::GetLocalStateDir() + "/lib/icinga2/pki/";
+       return Application::GetLocalStateDir() + "/lib/icinga2/certs/";
 }
 
 String ApiListener::GetCaDir(void)
@@ -70,9 +70,9 @@ String ApiListener::GetCaDir(void)
        return Application::GetLocalStateDir() + "/lib/icinga2/ca/";
 }
 
-String ApiListener::GetPkiRequestsDir(void)
+String ApiListener::GetCertificateRequestsDir(void)
 {
-       return Application::GetLocalStateDir() + "/lib/icinga2/pki-requests/";
+       return Application::GetLocalStateDir() + "/lib/icinga2/certificate-requests/";
 }
 
 void ApiListener::OnConfigLoaded(void)
@@ -519,8 +519,8 @@ void ApiListener::SyncClient(const JsonRpcConnection::Ptr& aclient, const Endpoi
 
                        JsonRpcConnection::SendCertificateRequest(aclient, MessageOrigin::Ptr(), String());
 
-                       if (Utility::PathExists(ApiListener::GetPkiRequestsDir()))
-                               Utility::Glob(ApiListener::GetPkiRequestsDir() + "/*.json", boost::bind(&JsonRpcConnection::SendCertificateRequest, aclient, MessageOrigin::Ptr(), _1), GlobFile);
+                       if (Utility::PathExists(ApiListener::GetCertificateRequestsDir()))
+                               Utility::Glob(ApiListener::GetCertificateRequestsDir() + "/*.json", boost::bind(&JsonRpcConnection::SendCertificateRequest, aclient, MessageOrigin::Ptr(), _1), GlobFile);
                }
 
                /* Make sure that the config updates are synced

diff --git a/lib/remote/apilistener.hpp b/lib/remote/apilistener.hpp
index 57e9db2677a9a5b7367e40b9d2f31dc2f6a700b4..72861f980b4d13a90e1c3f34d6b247916a31580b 100644 (file)
--- a/lib/remote/apilistener.hpp
+++ b/lib/remote/apilistener.hpp
@@ -60,9 +60,9 @@ public:
        ApiListener(void);
 
        static String GetApiDir(void);
-       static String GetPkiDir(void);
+       static String GetCertsDir(void);
        static String GetCaDir(void);
-       static String GetPkiRequestsDir(void);
+       static String GetCertificateRequestsDir(void);
 
        void UpdateSSLContext(void);
 

diff --git a/lib/remote/jsonrpcconnection-pki.cpp b/lib/remote/jsonrpcconnection-pki.cpp
index 1bd68633f949cdb1c4fabd167ec5308b8545861a..e14be3feb129abbe4cc64b4093eeecb4b328b3a5 100644 (file)
--- a/lib/remote/jsonrpcconnection-pki.cpp
+++ b/lib/remote/jsonrpcconnection-pki.cpp
@@ -91,7 +91,7 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
 
        result->Set("fingerprint_request", certFingerprint);
 
-       String requestDir = ApiListener::GetPkiRequestsDir();
+       String requestDir = ApiListener::GetCertificateRequestsDir();
        String requestPath = requestDir + "/" + certFingerprint + ".json";
 
        result->Set("ca", CertificateToString(cacert));
@@ -271,7 +271,7 @@ Value UpdateCertificateHandler(const MessageOrigin::Ptr& origin, const Dictionar
                        return Empty;
                }
 
-               String requestDir = ApiListener::GetPkiRequestsDir();
+               String requestDir = ApiListener::GetCertificateRequestsDir();
                String requestPath = requestDir + "/" + certFingerprint + ".json";
 
                std::cout << requestPath << "\n";

diff --git a/lib/remote/pkiutility.cpp b/lib/remote/pkiutility.cpp
index f3eef9d36f06c7cecd0151ae9d8a5507bf9dbd5b..c3d9917557f396865f1745cf8208973c09a89377 100644 (file)
--- a/lib/remote/pkiutility.cpp
+++ b/lib/remote/pkiutility.cpp
@@ -419,7 +419,7 @@ Dictionary::Ptr PkiUtility::GetCertificateRequests(void)
 {
        Dictionary::Ptr requests = new Dictionary();
 
-       String requestDir = ApiListener::GetPkiRequestsDir();
+       String requestDir = ApiListener::GetCertificateRequestsDir();
 
        if (Utility::PathExists(requestDir))
                Utility::Glob(requestDir + "/*.json", boost::bind(&CollectRequestHandler, requests, _1), GlobFile);