From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 30 Nov 2015 07:25:37 +0000 (+0100)
Subject: Remove the local zone name question in node wizard
X-Git-Tag: v2.5.0~682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb4f68f28dda4b63e18cd9a6f47b7501be08f089;p=icinga2

Remove the local zone name question in node wizard

fixes #10724
---

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index bbf4fd2b6..ba5dd03c1 100644
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -135,19 +135,6 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
 		String cn = answer;
 		cn = cn.Trim();
 
-		std::cout << ConsoleColorTag(Console_Bold)
-		    << "Please specifiy the local zone name"
-		    << ConsoleColorTag(Console_Normal) << " [" << cn << "]: ";
-
-		std::getline(std::cin, answer);
-		boost::algorithm::to_lower(answer);
-
-		if (answer.empty())
-			answer = cn;
-
-		String local_zone = answer;
-		local_zone = local_zone.Trim();
-
 		std::vector<std::string> endpoints;
 
 		String endpoint_buffer;
@@ -481,7 +468,7 @@ wizard_ticket:
 		NodeUtility::CreateBackupFile(constants_file);
 
 		NodeUtility::UpdateConstant("NodeName", cn);
-		NodeUtility::UpdateConstant("ZoneName", local_zone);
+		NodeUtility::UpdateConstant("ZoneName", cn);
 	} else {
 		/* master setup */
 		std::cout << ConsoleColorTag(Console_Bold) << "Starting the Master setup routine...\n";