tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
refs #5450
This commit is contained in:
Michael Friedrich 2017-09-06 12:11:48 +02:00 committed by Gunnar Beutner
parent 88b4a54e6b
commit 8040bda2e1
8 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cli/apisetuputility.cpp
View File

@ -69,7 +69,7 @@ bool ApiSetupUtility::SetupMasterCertificates(const String& cn)
if (PkiUtility::NewCa() > 0) if (PkiUtility::NewCa() > 0)
Log(LogWarning, "cli", "Found CA, skipping and using the existing one."); 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); Utility::MkDirP(pki_path, 0700);
String user = ScriptGlobal::Get("RunAsUser"); String user = ScriptGlobal::Get("RunAsUser");

2
lib/cli/casigncommand.cpp
View File

@ -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 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)) { if (!Utility::PathExists(requestFile)) {
Log(LogCritical, "cli") Log(LogCritical, "cli")

6
lib/cli/nodesetupcommand.cpp
View File

@ -131,7 +131,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
cn = vm["cn"].as<std::string>(); cn = vm["cn"].as<std::string>();
/* check whether the user wants to generate a new certificate or not */ /* 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") Log(LogInformation, "cli")
<< "Checking for existing certificates for common name '" << cn << "'..."; << "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 */ /* pki request a signed certificate from the master */
String pki_path = ApiListener::GetPkiDir(); String pki_path = ApiListener::GetCertsDir();
Utility::MkDirP(pki_path, 0700); Utility::MkDirP(pki_path, 0700);
String user = ScriptGlobal::Get("RunAsUser"); 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("NodeName", cn);
NodeUtility::UpdateConstant("ZoneName", vm["zone"].as<std::string>()); 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); String tempTicketPath = Utility::CreateTempFile(ticketPath + ".XXXXXX", 0600, fp);

4
lib/cli/nodewizardcommand.cpp
View File

@ -230,7 +230,7 @@ wizard_endpoint_loop_start:
} }
/* workaround for fetching the master cert */ /* workaround for fetching the master cert */
String pki_path = ApiListener::GetPkiDir(); String pki_path = ApiListener::GetCertsDir();
Utility::MkDirP(pki_path, 0700); Utility::MkDirP(pki_path, 0700);
String user = ScriptGlobal::Get("RunAsUser"); String user = ScriptGlobal::Get("RunAsUser");
@ -498,7 +498,7 @@ wizard_ticket:
cn = cn.Trim(); cn = cn.Trim();
/* check whether the user wants to generate a new certificate or not */ /* 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) std::cout << ConsoleColorTag(Console_Normal)
<< "Checking for existing certificates for common name '" << cn << "'...\n"; << "Checking for existing certificates for common name '" << cn << "'...\n";

12
lib/remote/apilistener.cpp
View File

@ -60,9 +60,9 @@ String ApiListener::GetApiDir(void)
return Application::GetLocalStateDir() + "/lib/icinga2/api/"; 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) String ApiListener::GetCaDir(void)
@ -70,9 +70,9 @@ String ApiListener::GetCaDir(void)
return Application::GetLocalStateDir() + "/lib/icinga2/ca/"; 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) void ApiListener::OnConfigLoaded(void)
@ -519,8 +519,8 @@ void ApiListener::SyncClient(const JsonRpcConnection::Ptr& aclient, const Endpoi
JsonRpcConnection::SendCertificateRequest(aclient, MessageOrigin::Ptr(), String()); JsonRpcConnection::SendCertificateRequest(aclient, MessageOrigin::Ptr(), String());
if (Utility::PathExists(ApiListener::GetPkiRequestsDir())) if (Utility::PathExists(ApiListener::GetCertificateRequestsDir()))
Utility::Glob(ApiListener::GetPkiRequestsDir() + "/*.json", boost::bind(&JsonRpcConnection::SendCertificateRequest, aclient, MessageOrigin::Ptr(), _1), GlobFile); Utility::Glob(ApiListener::GetCertificateRequestsDir() + "/*.json", boost::bind(&JsonRpcConnection::SendCertificateRequest, aclient, MessageOrigin::Ptr(), _1), GlobFile);
} }
/* Make sure that the config updates are synced /* Make sure that the config updates are synced

4
lib/remote/apilistener.hpp
View File

@ -60,9 +60,9 @@ public:
ApiListener(void); ApiListener(void);
static String GetApiDir(void); static String GetApiDir(void);
static String GetPkiDir(void); static String GetCertsDir(void);
static String GetCaDir(void); static String GetCaDir(void);
static String GetPkiRequestsDir(void); static String GetCertificateRequestsDir(void);
void UpdateSSLContext(void); void UpdateSSLContext(void);

4
lib/remote/jsonrpcconnection-pki.cpp
View File

@ -91,7 +91,7 @@ Value RequestCertificateHandler(const MessageOrigin::Ptr& origin, const Dictiona
result->Set("fingerprint_request", certFingerprint); result->Set("fingerprint_request", certFingerprint);
String requestDir = ApiListener::GetPkiRequestsDir(); String requestDir = ApiListener::GetCertificateRequestsDir();
String requestPath = requestDir + "/" + certFingerprint + ".json"; String requestPath = requestDir + "/" + certFingerprint + ".json";
result->Set("ca", CertificateToString(cacert)); result->Set("ca", CertificateToString(cacert));
@ -271,7 +271,7 @@ Value UpdateCertificateHandler(const MessageOrigin::Ptr& origin, const Dictionar
return Empty; return Empty;
} }
String requestDir = ApiListener::GetPkiRequestsDir(); String requestDir = ApiListener::GetCertificateRequestsDir();
String requestPath = requestDir + "/" + certFingerprint + ".json"; String requestPath = requestDir + "/" + certFingerprint + ".json";
std::cout << requestPath << "\n"; std::cout << requestPath << "\n";

2
lib/remote/pkiutility.cpp
View File

@ -419,7 +419,7 @@ Dictionary::Ptr PkiUtility::GetCertificateRequests(void)
{ {
Dictionary::Ptr requests = new Dictionary(); Dictionary::Ptr requests = new Dictionary();
String requestDir = ApiListener::GetPkiRequestsDir(); String requestDir = ApiListener::GetCertificateRequestsDir();
if (Utility::PathExists(requestDir)) if (Utility::PathExists(requestDir))
Utility::Glob(requestDir + "/*.json", boost::bind(&CollectRequestHandler, requests, _1), GlobFile); Utility::Glob(requestDir + "/*.json", boost::bind(&CollectRequestHandler, requests, _1), GlobFile);