From: Jean Flach <jean-marcel.flach@icinga.com>
Date: Wed, 2 May 2018 15:42:30 +0000 (+0200)
Subject: Rename "dont-disable-confd"
X-Git-Tag: v2.9.0~63^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=026359d4042879cabfacf12129e0566a49cae6bd;p=icinga2

Rename "dont-disable-confd"

Double negation is confusing. Also this would change the default
behaviour and could lead to problems in automated environments.

refs #4508
---

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index 260d01349..fbc47dbd9 100644
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -67,7 +67,7 @@ void NodeSetupCommand::InitParameters(boost::program_options::options_descriptio
 		("accept-commands", "Accept commands from master")
 		("master", "Use setup for a master instance")
 		("global_zones", po::value<std::vector<std::string> >(), "The names of the additional global zones.")
-		("dont-disable-confd", "Disables the conf.d directory during the setup");
+		("disable-confd", "Disables the conf.d directory during the setup");
 
 	hiddenDesc.add_options()
 		("master_zone", po::value<std::string>(), "DEPRECATED: The name of the master zone")
@@ -245,7 +245,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
 	Log(LogInformation, "cli")
 		<< "Edit the api feature config file '" << apipath << "' and set a secure 'ticket_salt' attribute.";
 
-	if (!vm.count("dont-disable-confd")) {
+	if (vm.count("disable-confd")) {
 		/* Disable conf.d inclusion */
 		NodeUtility::UpdateConfiguration("\"conf.d\"", false, true);
 
@@ -570,7 +570,7 @@ int NodeSetupCommand::SetupNode(const boost::program_options::variables_map& vm,
 		Log(LogInformation, "cli", "Make sure to restart Icinga 2.");
 	}
 
-	if (!vm.count("dont-disable-confd")) {
+	if (vm.count("disable-confd")) {
 
 		/* Disable conf.d inclusion */
 		NodeUtility::UpdateConfiguration("\"conf.d\"", false, true);