From: Michael Friedrich <michael.friedrich@netways.de>
Date: Thu, 25 Jun 2015 08:21:18 +0000 (+0200)
Subject: Only run 'api setup' if the feature was not enabled
X-Git-Tag: v2.4.0~565
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663f09e47576f315bc03005fb597e4539d014e6b;p=icinga2

Only run 'api setup' if the feature was not enabled

It is safe to assume that the user either did run
'node wizard' or 'node setup' in >= 2.3.x before, or
manually enabled the api feature and deployed the
certificates (otherwise Icinga2 wouldn't start either).

In that case we'll skip the api setup to ensure that we
don't override any existing configuration at all.

refs #9471
---

diff --git a/lib/cli/apisetuputility.cpp b/lib/cli/apisetuputility.cpp
index 5c3d912ee..5694d7059 100644
--- a/lib/cli/apisetuputility.cpp
+++ b/lib/cli/apisetuputility.cpp
@@ -45,6 +45,16 @@ String ApiSetupUtility::GetConfdPath(void)
 
 int ApiSetupUtility::SetupMaster(void)
 {
+	/* if the 'api' feature is enabled we can safely assume
+	 * that either 'api setup' was run, or the user manually
+	 * enabled the api including all certificates e.g. by 'node wizard' in <= v2.3.x
+	 */
+	if (FeatureUtility::CheckFeatureEnabled("api")) {
+		Log(LogInformation, "cli")
+		    << "'api' feature already enabled, skipping feature enable and master certificate creation.\n";
+		return 0;
+	}
+
 	Log(LogInformation, "cli")
 	    << "Generating new CA.\n";
 
@@ -177,6 +187,5 @@ int ApiSetupUtility::SetupMaster(void)
 	enable.push_back("api");
 	FeatureUtility::EnableFeatures(enable);
 
-
 	return 0;
 }