From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Fri, 4 May 2018 09:38:30 +0000 (+0200)
Subject: Small changes to node wizard/command
X-Git-Tag: v2.9.0~63^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8fc3a3ffaba2af424c3955678c8b55a63a7bc9e;p=icinga2

Small changes to node wizard/command

refs #4508
---

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index fbc47dbd9..89df313f5 100644
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -247,7 +247,12 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
 
 	if (vm.count("disable-confd")) {
 		/* Disable conf.d inclusion */
-		NodeUtility::UpdateConfiguration("\"conf.d\"", false, true);
+		if (NodeUtility::UpdateConfiguration("\"conf.d\"", false, true))
+			Log(LogInformation, "cli")
+				<< "Disabled conf.d inclusion";
+		else
+			Log(LogWarning, "cli")
+				<< "Tried to disable conf.d inclusion but failed, possibly it's already disabled.";
 
 		String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf";
 		std::ifstream apiUsersFile(apiUsersFilePath);
diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index 3398aaa85..615f3a4d3 100644
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -628,7 +628,7 @@ wizard_global_zone_loop_start:
 			<< "The deactivation of the conf.d directory was skipped.";
 	else {
 		std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundGreen)
-			<< "Disable the inclusion of the conf.d directory...\n"
+			<< "Disabling the inclusion of the conf.d directory...\n"
 			<< ConsoleColorTag(Console_Normal);
 
 		if(!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) {
@@ -814,9 +814,7 @@ wizard_global_zone_loop_start:
 
 	Log(LogInformation, "cli", "Updating constants.conf.");
 	
-	String constants_file = Application::GetSysconfDir() + "/icinga2/constants.conf";
-
-	NodeUtility::CreateBackupFile(constants_file);
+	NodeUtility::CreateBackupFile(NodeUtility::GetConstantsConfPath());
 
 	NodeUtility::UpdateConstant("NodeName", cn);
 	NodeUtility::UpdateConstant("ZoneName", cn);