]> granicus.if.org Git - icinga2/commitdiff
Remove the local zone name question in node wizard
authorGunnar Beutner <gunnar@beutner.name>
Mon, 30 Nov 2015 07:25:37 +0000 (08:25 +0100)
committerGunnar Beutner <gunnar@beutner.name>
Mon, 30 Nov 2015 07:25:37 +0000 (08:25 +0100)
fixes #10724

lib/cli/nodewizardcommand.cpp

index bbf4fd2b6407a3667c67421312b32661c2d9d264..ba5dd03c1b9692e6ed6f2dd3ede3450ff13ba740 100644 (file)
@@ -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";