Small changes to node wizard/command

refs #4508

diff --git a/lib/cli/nodesetupcommand.cpp b/lib/cli/nodesetupcommand.cpp
index fbc47dbd9a206e232de49574854725935fb4d73c..89df313f5f02fda12a81608e7b2cfc142d4e20ff 100644 (file)
--- a/lib/cli/nodesetupcommand.cpp
+++ b/lib/cli/nodesetupcommand.cpp
@@ -247,7 +247,12 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
 
        if (vm.count("disable-confd")) {
                /* Disable conf.d inclusion */
-               NodeUtility::UpdateConfiguration("\"conf.d\"", false, true);
+               if (NodeUtility::UpdateConfiguration("\"conf.d\"", false, true))
+                       Log(LogInformation, "cli")
+                               << "Disabled conf.d inclusion";
+               else
+                       Log(LogWarning, "cli")
+                               << "Tried to disable conf.d inclusion but failed, possibly it's already disabled.";
 
                String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf";
                std::ifstream apiUsersFile(apiUsersFilePath);

diff --git a/lib/cli/nodewizardcommand.cpp b/lib/cli/nodewizardcommand.cpp
index 3398aaa8568cda9cd34a67e5d0fb38949cf4137b..615f3a4d3c223fcdc1a726facfcd542045d87a22 100644 (file)
--- a/lib/cli/nodewizardcommand.cpp
+++ b/lib/cli/nodewizardcommand.cpp
@@ -628,7 +628,7 @@ wizard_global_zone_loop_start:
                        << "The deactivation of the conf.d directory was skipped.";
        else {
                std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundGreen)
-                       << "Disable the inclusion of the conf.d directory...\n"
+                       << "Disabling the inclusion of the conf.d directory...\n"
                        << ConsoleColorTag(Console_Normal);
 
                if(!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) {
@@ -814,9 +814,7 @@ wizard_global_zone_loop_start:
 
        Log(LogInformation, "cli", "Updating constants.conf.");
        
-       String constants_file = Application::GetSysconfDir() + "/icinga2/constants.conf";
-
-       NodeUtility::CreateBackupFile(constants_file);
+       NodeUtility::CreateBackupFile(NodeUtility::GetConstantsConfPath());
 
        NodeUtility::UpdateConstant("NodeName", cn);
        NodeUtility::UpdateConstant("ZoneName", cn);