mirror of
https://github.com/Icinga/icinga2.git
synced 2025-04-08 17:05:25 +02:00
Warn in case of failed conf.d exclusion also on master setup
refs #4508
This commit is contained in:
parent
85dde65d00
commit
662d36fd16
@ -633,7 +633,7 @@ wizard_global_zone_loop_start:
|
||||
|
||||
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."
|
||||
<< "Failed to disable conf.d inclusion, it may already be disabled.\n"
|
||||
<< ConsoleColorTag(Console_Normal);
|
||||
}
|
||||
|
||||
@ -840,7 +840,11 @@ wizard_global_zone_loop_start:
|
||||
<< "Disable the inclusion of the conf.d directory...\n"
|
||||
<< 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 */
|
||||
String apiUsersFilePath = Application::GetSysconfDir() + "/icinga2/conf.d/api-users.conf";
|
||||
|
Loading…
x
Reference in New Issue
Block a user