From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 8 Jul 2015 13:32:11 +0000 (+0200)
Subject: Split ApiSetupUtility::SetupMaster() into multiple functions
X-Git-Tag: v2.4.0~523
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f123c8218d57c19c4630c0b8aa367951c3c1f806;p=icinga2

Split ApiSetupUtility::SetupMaster() into multiple functions

refs #9590
---

diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index 46314f5fa..ef641a526 100644
--- a/lib/cli/apisetuputility.cpp
+++ b/lib/cli/apisetuputility.cpp
@@ -55,6 +55,15 @@ int ApiSetupUtility::SetupMaster(const String& cn)
 		return 0;
 	}
 
+	SetupMasterCertificates(cn);
+	SetupMasterApiUser(cn);
+	SetupMasterEnableApi(cn);
+
+	return 0;
+}
+
+int ApiSetupUtility::SetupMasterCertificates(const String& cn)
+{
 	Log(LogInformation, "cli")
 	    << "Generating new CA.\n";
 
@@ -143,6 +152,11 @@ int ApiSetupUtility::SetupMaster(const String& cn)
 		}
 	}
 
+	return 0;
+}
+
+int ApiSetupUtility::SetupMasterApiUser(const String& cn)
+{
 	String api_username = "root"; //TODO make this available as cli parameter?
 	String api_password = RandomString(8);
 	String apiuserspath = GetConfdPath() + "/api-users.conf";
@@ -178,7 +192,11 @@ int ApiSetupUtility::SetupMaster(const String& cn)
 		    << boost::errinfo_file_name(apiuserspathtmp));
 	}
 
+	return 0;
+}
 
+int ApiSetupUtility::SetupMasterEnableApi(const String& cn)
+{
 	Log(LogInformation, "cli", "Enabling the ApiListener feature.\n");
 
 	std::vector<std::string> enable;
diff --git a/lib/cli/apisetuputility.hpp b/lib/cli/apisetuputility.hpp
index ce8ceb8dd..b6c36c2a6 100644
--- a/lib/cli/apisetuputility.hpp
+++ b/lib/cli/apisetuputility.hpp
@@ -38,6 +38,11 @@ class I2_CLI_API ApiSetupUtility
 {
 public:
 	static int SetupMaster(const String& cn);
+
+	static int SetupMasterCertificates(const String& cn);
+	static int SetupMasterApiUser(const String& cn);
+	static int SetupMasterEnableApi(const String& cn);
+
 	static String GetConfdPath(void);
 
 private: