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

Correct node wizard output formatting

This commit is contained in:
Noah Hilverling 2017-11-08 08:45:55 +01:00
parent 36fddaf09b
commit e6f94ff203
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/cli/nodewizardcommand.cpp
View File

@ -340,7 +340,9 @@ wizard_ticket:
/* Check whether we can connect to the parent node and fetch the client and CA certificate. */ /* Check whether we can connect to the parent node and fetch the client and CA certificate. */
if (connectToParent) { if (connectToParent) {
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "\nPlease specify the request ticket generated on your Icinga 2 master (optional)." << "\nPlease specify the request ticket generated on your Icinga 2 master "
<< ConsoleColorTag(Console_Normal) << "(optional)"
<< ConsoleColorTag(Console_Bold) << "."
<< ConsoleColorTag(Console_Normal) << "\n" << ConsoleColorTag(Console_Normal) << "\n"
<< " (Hint: # icinga2 pki ticket --cn '" << cn << "'): "; << " (Hint: # icinga2 pki ticket --cn '" << cn << "'): ";
@ -408,17 +410,20 @@ wizard_ticket:
/* apilistener config */ /* apilistener config */
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "\nPlease specify the API bind host/port" << "Please specify the API bind host/port "
<< ConsoleColorTag(Console_Normal) << " (optional):\n" << ConsoleColorTag(Console_Normal) << "(optional)"
<< ConsoleColorTag(Console_Bold) << "Bind Host" << ConsoleColorTag(Console_Bold) << ":\n";
<< ConsoleColorTag(Console_Normal) << " []: ";
std::cout << ConsoleColorTag(Console_Bold)
<< "Bind Host" << ConsoleColorTag(Console_Normal) << " []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
String bindHost = answer; String bindHost = answer;
bindHost = bindHost.Trim(); bindHost = bindHost.Trim();
std::cout << "Bind Port []: "; std::cout << ConsoleColorTag(Console_Bold)
<< "Bind Port" << ConsoleColorTag(Console_Normal) << " []: ";
std::getline(std::cin, answer); std::getline(std::cin, answer);
@ -608,7 +613,10 @@ int NodeWizardCommand::MasterSetup(void) const
/* apilistener config */ /* apilistener config */
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "Please specify the API bind host/port (optional):\n"; << "Please specify the API bind host/port "
<< ConsoleColorTag(Console_Normal) << "(optional)"
<< ConsoleColorTag(Console_Bold) << ":\n";
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "Bind Host" << ConsoleColorTag(Console_Normal) << " []: "; << "Bind Host" << ConsoleColorTag(Console_Normal) << " []: ";