From 7bcca244e7876733509d6060a27506e1d6a0b106 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 13 Nov 2014 15:32:41 +0100 Subject: [PATCH] Remove some more redundant code from "node wizard" refs #7656 --- lib/cli/nodewizardcommand.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp index ab75e5aff..ab5ea64fa 100644 --- a/lib/cli/nodewizardcommand.cpp +++ b/lib/cli/nodewizardcommand.cpp @@ -247,33 +247,7 @@ wizard_master_host: return 1; } - /* store ca in /etc/icinga2/pki */ - String ca_path = PkiUtility::GetLocalCaPath(); - String ca_key = ca_path + "/ca.key"; - String ca = ca_path + "/ca.crt"; - String serial = ca_path + "/serial.txt"; - /* fix permissions: root -> icinga daemon user */ - if (!Utility::SetFileOwnership(ca_path, user, group)) { - Log(LogWarning, "cli") - << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << ca_path << "'. Verify it yourself!"; - } - if (!Utility::SetFileOwnership(ca, user, group)) { - Log(LogWarning, "cli") - << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << ca << "'. Verify it yourself!"; - } - if (!Utility::SetFileOwnership(ca_key, user, group)) { - Log(LogWarning, "cli") - << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << ca_key << "'. Verify it yourself!"; - } - if (!Utility::SetFileOwnership(serial, user, group)) { - Log(LogWarning, "cli") - << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << serial << "'. Verify it yourself!"; - } - if (!Utility::SetFileOwnership(node_cert, user, group)) { - Log(LogWarning, "cli") - << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << node_cert << "'. Verify it yourself!"; - } if (!Utility::SetFileOwnership(node_key, user, group)) { Log(LogWarning, "cli") << "Cannot set ownership for user '" << user << "' group '" << group << "' on file '" << node_key << "'. Verify it yourself!"; -- 2.49.0