From 6d114b16e4a1fb150ff1631e933c764d411cf588 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 1 Oct 2018 16:24:37 +0200 Subject: [PATCH] node setup: always respect --accept-config and --accept-commands --- lib/cli/nodesetupcommand.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp index 86581e6ea..e97b9952e 100644 --- a/lib/cli/nodesetupcommand.cpp +++ b/lib/cli/nodesetupcommand.cpp @@ -121,12 +121,6 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v if (vm.count("trustedcert")) Log(LogWarning, "cli", "Master for Node setup: Ignoring --trustedcert"); - if (vm.count("accept-config")) - Log(LogWarning, "cli", "Master for Node setup: Ignoring --accept-config"); - - if (vm.count("accept-commands")) - Log(LogWarning, "cli", "Master for Node setup: Ignoring --accept-commands"); - String cn = Utility::GetFQDN(); if (vm.count("cn")) @@ -212,6 +206,18 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v fp << " bind_port = " << tokens[1] << "\n"; } + fp << "\n"; + + if (vm.count("accept-config")) + fp << " accept_config = true\n"; + else + fp << " accept_config = false\n"; + + if (vm.count("accept-commands")) + fp << " accept_commands = true\n"; + else + fp << " accept_commands = false\n"; + fp << "\n" << " ticket_salt = TicketSalt\n" << "}\n";