tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-26 07:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLI: Rename client -> agent

Browse Source
This commit is contained in:
Michael Friedrich 2019-07-20 12:53:19 +02:00
parent 9fc41e0e91
commit 647348fbca
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/cli/nodewizardcommand.cpp
View File

@ -92,9 +92,9 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
*/ */
std::string answer; std::string answer;
/* master or satellite/client setup */ /* master or satellite/agent setup */
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
<< "Please specify if this is a satellite/client setup " << "Please specify if this is an agent/satellite setup "
<< "('n' installs a master setup)" << ConsoleColorTag(Console_Normal) << "('n' installs a master setup)" << ConsoleColorTag(Console_Normal)
<< " [Y/n]: "; << " [Y/n]: ";
std::getline (std::cin, answer); std::getline (std::cin, answer);
@ -110,7 +110,7 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
if (choice.Contains("n")) if (choice.Contains("n"))
res = MasterSetup(); res = MasterSetup();
else else
res = ClientSetup(); res = AgentSatelliteSetup();
if (res != 0) if (res != 0)
return res; return res;
@ -127,13 +127,13 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
return 0; return 0;
} }
int NodeWizardCommand::ClientSetup() const int NodeWizardCommand::AgentSatelliteSetup() const
{ {
std::string answer; std::string answer;
String choice; String choice;
bool connectToParent = false; bool connectToParent = false;
std::cout << "Starting the Client/Satellite setup routine...\n\n"; std::cout << "Starting the Agent/Satellite setup routine...\n\n";
/* CN */ /* CN */
std::cout << ConsoleColorTag(Console_Bold) std::cout << ConsoleColorTag(Console_Bold)
@ -439,7 +439,7 @@ wizard_ticket:
<< "Reconfiguring Icinga...\n" << "Reconfiguring Icinga...\n"
<< ConsoleColorTag(Console_Normal); << ConsoleColorTag(Console_Normal);
/* disable the notifications feature on client nodes */ /* disable the notifications feature on agent/satellite nodes */
Log(LogInformation, "cli", "Disabling the Notification feature."); Log(LogInformation, "cli", "Disabling the Notification feature.");
FeatureUtility::DisableFeatures({ "notification" }); FeatureUtility::DisableFeatures({ "notification" });
@ -603,7 +603,7 @@ wizard_global_zone_loop_start:
<< ConsoleColorTag(Console_Normal); << ConsoleColorTag(Console_Normal);
} }
/* Satellite/Clients should not include the api-users.conf file. /* Satellite/Agents should not include the api-users.conf file.
* The configuration should instead be managed via config sync or automation tools. * The configuration should instead be managed via config sync or automation tools.
*/ */
} }

2
lib/cli/nodewizardcommand.hpp
View File

@ -27,7 +27,7 @@ public:
boost::program_options::options_description& hiddenDesc) const override; boost::program_options::options_description& hiddenDesc) const override;
private: private:
int ClientSetup() const; int AgentSatelliteSetup() const;
int MasterSetup() const; int MasterSetup() const;
}; };