From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Sat, 20 Jul 2019 10:53:19 +0000 (+0200)
Subject: CLI: Rename client -> agent
X-Git-Tag: v2.11.0-rc1~15^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=647348fbca48870e7f589ec66810b9682e815ca5;p=icinga2

CLI: Rename client -> agent
---

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index 33243851f..abf87d87e 100644
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -92,9 +92,9 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
 	 */
 
 	std::string answer;
-	/* master or satellite/client setup */
+	/* master or satellite/agent setup */
 	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)
 		<< " [Y/n]: ";
 	std::getline (std::cin, answer);
@@ -110,7 +110,7 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
 	if (choice.Contains("n"))
 		res = MasterSetup();
 	else
-		res = ClientSetup();
+		res = AgentSatelliteSetup();
 
 	if (res != 0)
 		return res;
@@ -127,13 +127,13 @@ int NodeWizardCommand::Run(const boost::program_options::variables_map& vm,
 	return 0;
 }
 
-int NodeWizardCommand::ClientSetup() const
+int NodeWizardCommand::AgentSatelliteSetup() const
 {
 	std::string answer;
 	String choice;
 	bool connectToParent = false;
 
-	std::cout << "Starting the Client/Satellite setup routine...\n\n";
+	std::cout << "Starting the Agent/Satellite setup routine...\n\n";
 
 	/* CN */
 	std::cout << ConsoleColorTag(Console_Bold)
@@ -439,7 +439,7 @@ wizard_ticket:
 		<< "Reconfiguring Icinga...\n"
 		<< 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.");
 
 	FeatureUtility::DisableFeatures({ "notification" });
@@ -603,7 +603,7 @@ wizard_global_zone_loop_start:
 				<< 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.
 		 */
 	}
diff --git a/lib/cli/nodewizardcommand.hpp b/lib/cli/nodewizardcommand.hpp
index e295ee7f8..dfda70c8a 100644
--- a/lib/cli/nodewizardcommand.hpp
+++ b/lib/cli/nodewizardcommand.hpp
@@ -27,7 +27,7 @@ public:
 		boost::program_options::options_description& hiddenDesc) const override;
 
 private:
-	int ClientSetup() const;
+	int AgentSatelliteSetup() const;
 	int MasterSetup() const;
 };