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

Warn in case of failed conf.d exclusion also on master setup

Browse Source 
refs #4508
This commit is contained in:
Michael Insel 2018-05-03 17:12:06 +02:00 committed by Michael Friedrich
parent 85dde65d00
commit 662d36fd16
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cli/nodewizardcommand.cpp
View File

@ -633,7 +633,7 @@ wizard_global_zone_loop_start:
if(!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) { if(!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) {
std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundRed) std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundRed)
<< "Failed to disable conf.d inclusion, it may already be disabled." << "Failed to disable conf.d inclusion, it may already be disabled.\n"
<< ConsoleColorTag(Console_Normal); << ConsoleColorTag(Console_Normal);
} }
@ -840,7 +840,11 @@ wizard_global_zone_loop_start:
<< "Disable the inclusion of the conf.d directory...\n" << "Disable the inclusion of the conf.d directory...\n"
<< ConsoleColorTag(Console_Normal); << ConsoleColorTag(Console_Normal);
NodeUtility::UpdateConfiguration("\"conf.d\"", false, true); if (!NodeUtility::UpdateConfiguration("\"conf.d\"", false, true)) {
std::cout << ConsoleColorTag(Console_Bold | Console_ForegroundRed)
<< "Failed to disable conf.d inclusion, it may already be disabled.\n"
<< ConsoleColorTag(Console_Normal);
}
/* Include api-users.conf */ /* Include api-users.conf */
String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf"; String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf";