tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rewrite some of the wizard questions 

refs #8891
This commit is contained in:
Michael Friedrich 2015-04-27 11:10:49 +02:00 committed by Gunnar Beutner
parent 460d858a8e
commit 4fcbfbe8ca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cli/nodewizardcommand.cpp
View File

@ -160,7 +160,7 @@ wizard_endpoint_loop_start:
endpoint_buffer = answer; endpoint_buffer = answer;
endpoint_buffer.Trim(); endpoint_buffer.Trim();
std::cout << "Do you want to establish a connection to the master " << ConsoleColorTag(Console_Bold) << "now " << ConsoleColorTag(Console_Normal) << " [Y/n]? "; std::cout << "Do you want to establish a connection to the master " << ConsoleColorTag(Console_Bold) << "from this node?" << ConsoleColorTag(Console_Normal) << " [Y/n]: ";
std::getline (std::cin, answer); std::getline (std::cin, answer);
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
@ -168,7 +168,7 @@ wizard_endpoint_loop_start:
if (choice.Contains("n")) { if (choice.Contains("n")) {
Log(LogWarning, "cli", "Node to master connection setup skipped"); Log(LogWarning, "cli", "Node to master connection setup skipped");
std::cout << "Connection setup skipped, you know hat you are doing.\n"; std::cout << "Connection setup skipped. Please configure your master to connect to this node.\n";
} else { } else {
std::cout << ConsoleColorTag(Console_Bold) << "Please fill out the master connection information:" << ConsoleColorTag(Console_Normal) << "\n"; std::cout << ConsoleColorTag(Console_Bold) << "Please fill out the master connection information:" << ConsoleColorTag(Console_Normal) << "\n";
std::cout << ConsoleColorTag(Console_Bold) << "Master endpoint host" << ConsoleColorTag(Console_Normal) << " (Your master's IP address or FQDN): "; std::cout << ConsoleColorTag(Console_Bold) << "Master endpoint host" << ConsoleColorTag(Console_Normal) << " (Your master's IP address or FQDN): ";
@ -177,7 +177,7 @@ wizard_endpoint_loop_start:
boost::algorithm::to_lower(answer); boost::algorithm::to_lower(answer);
if (answer.empty()) { if (answer.empty()) {
Log(LogWarning, "cli", "Please enter the masters endpoint data"); Log(LogWarning, "cli", "Please enter the master's endpoint connection information.");
goto wizard_endpoint_loop_start; goto wizard_endpoint_loop_start;
} }
@ -394,8 +394,8 @@ wizard_ticket:
<< " cert_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".crt\"\n" << " cert_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".crt\"\n"
<< " key_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".key\"\n" << " key_path = SysconfDir + \"/icinga2/pki/\" + NodeName + \".key\"\n"
<< " ca_path = SysconfDir + \"/icinga2/pki/ca.crt\"\n" << " ca_path = SysconfDir + \"/icinga2/pki/ca.crt\"\n"
<< " accept_config = " << accept_config << '\n' << " accept_config = " << accept_config << "\n"
<< " accept_commands = " << accept_commands << '\n'; << " accept_commands = " << accept_commands << "\n";
if (!bind_host.IsEmpty()) if (!bind_host.IsEmpty())
fp << " bind_host = \"" << bind_host << "\"\n"; fp << " bind_host = \"" << bind_host << "\"\n";