From bf68dbcaca0a8dc85c8427042a3012cd482ff225 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 14 Aug 2018 08:33:03 +0200 Subject: [PATCH] IcingaConfig: fix Service Override template name Got broken by fd372c6 for #1579 fixes #1601 --- library/Director/IcingaConfig/IcingaConfig.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/Director/IcingaConfig/IcingaConfig.php b/library/Director/IcingaConfig/IcingaConfig.php index 9c8e1253..4632f65c 100644 --- a/library/Director/IcingaConfig/IcingaConfig.php +++ b/library/Director/IcingaConfig/IcingaConfig.php @@ -533,7 +533,7 @@ globals.directorWarnOnceForThresholds = function() { return sprintf( ' - const DirectorOverrideTemplate = "%s" +const DirectorOverrideTemplate = "%s" if (! globals[DirectorOverrideTemplate]) { const DirectorOverrideVars = "%s" @@ -549,7 +549,7 @@ if (! globals[DirectorOverrideTemplate]) { } } - template Service DirectorOverrideTemplate ignore_on_error { + template Service DirectorOverrideTemplate { /** * Seems that host is missing when used in a service object, works fine for * apply rules @@ -571,8 +571,8 @@ if (! globals[DirectorOverrideTemplate]) { } } ', - $settings->override_services_varname, - $settings->override_services_templatename + $settings->override_services_templatename, + $settings->override_services_varname ); }