From 633e4faef90dd422e7c3fe182675d0df16eecc19 Mon Sep 17 00:00:00 2001 From: Nick Chappell Date: Tue, 18 Nov 2014 22:16:42 -0800 Subject: [PATCH 1/2] Use %> instead of -%> at the end of some ERB tags so that trailing whitespace isn't surpressed. Surpressing the trailing whitespace caused problems where there was one more parameters listed after each other. Each parameter would get squashed onto a single line, causing a syntax error when Icinga2 parsed the object file. refs#7715: https://dev.icinga.org/issues/7715 --- templates/object_apply_dependency.conf.erb | 8 ++++---- .../object_apply_service_to_host.conf.erb | 20 +++++++++---------- templates/object_dependency.conf.erb | 4 ++-- templates/object_host.conf.erb | 20 +++++++++---------- templates/object_hostgroup.conf.erb | 4 ++-- templates/object_notification.conf.erb | 4 ++-- templates/object_scheduleddowntime.conf.erb | 2 +- templates/object_service.conf.erb | 20 +++++++++---------- templates/object_servicegroup.conf.erb | 4 ++-- templates/object_statusdatawriter.conf.erb | 2 +- templates/object_user.conf.erb | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/templates/object_apply_dependency.conf.erb b/templates/object_apply_dependency.conf.erb index bb35774..24fbd67 100644 --- a/templates/object_apply_dependency.conf.erb +++ b/templates/object_apply_dependency.conf.erb @@ -25,10 +25,10 @@ apply Dependency "<%= @object_name %>" to "<%= @object_type %>"{ child_service_name = "<%= @child_service_name -%>" <%- end -%> <%- if @disable_checks -%> - disable_checks = <%= @disable_checks -%> + disable_checks = <%= @disable_checks %> <%- end -%> <%- if @disable_notifications -%> - disable_notifications = <%= @disable_notifications -%> + disable_notifications = <%= @disable_notifications %> <%- end -%> <%- if @period -%> period = "<%= @period -%>" @@ -37,9 +37,9 @@ apply Dependency "<%= @object_name %>" to "<%= @object_type %>"{ states = [ <%- @states.each do |state| -%> <%= state %>, <%- end -%>] <%- end -%> <%- if @assign_where -%> - assign where <%= @assign_where -%> + assign where <%= @assign_where %> <%- end -%> <%- if @ignore_where -%> - ignore where <%= @ignore_where -%> + ignore where <%= @ignore_where %> <%- end -%> } diff --git a/templates/object_apply_service_to_host.conf.erb b/templates/object_apply_service_to_host.conf.erb index 6871dd8..867798c 100644 --- a/templates/object_apply_service_to_host.conf.erb +++ b/templates/object_apply_service_to_host.conf.erb @@ -40,34 +40,34 @@ apply Service "<%= @object_servicename %>" to Host { <%- end -%> <%- end -%> <%- if @max_check_attempts -%> - max_check_attempts = <%= @max_check_attempts -%> + max_check_attempts = <%= @max_check_attempts %> <%- end -%> <%- if @check_period -%> - check_period = <%= @check_period -%> + check_period = <%= @check_period %> <%- end -%> <%- if @check_interval -%> - check_interval = <%= @check_interval -%> + check_interval = <%= @check_interval %> <%- end -%> <%- if @retry_interval -%> - retry_interval = <%= @retry_interval -%> + retry_interval = <%= @retry_interval %> <%- end -%> <%- if @enable_notifications -%> - enable_notifications = <%= @enable_notifications -%> + enable_notifications = <%= @enable_notifications %> <%- end -%> <%- if @enable_active_checks -%> - enable_active_checks = <%= @enable_active_checks -%> + enable_active_checks = <%= @enable_active_checks %> <%- end -%> <%- if @enable_passive_checks -%> - enable_passive_checks = <%= @enable_passive_checks -%> + enable_passive_checks = <%= @enable_passive_checks %> <%- end -%> <%- if @enable_event_handler -%> - enable_event_handler = <%= @enable_event_handler -%> + enable_event_handler = <%= @enable_event_handler %> <%- end -%> <%- if @enable_flapping -%> - enable_flapping = <%= @enable_flapping -%> + enable_flapping = <%= @enable_flapping %> <%- end -%> <%- if @enable_perfdata -%> - enable_perfdata = <%= @enable_perfdata -%> + enable_perfdata = <%= @enable_perfdata %> <%- end -%> <%- if @event_command -%> event_command = "<%= @event_command -%>" diff --git a/templates/object_dependency.conf.erb b/templates/object_dependency.conf.erb index 7de0716..6b25263 100644 --- a/templates/object_dependency.conf.erb +++ b/templates/object_dependency.conf.erb @@ -21,10 +21,10 @@ object Dependency "<%= @object_name %>" { child_service_name = "<%= @child_service_name -%>" <%- end -%> <%- if @disable_checks -%> - disable_checks = <%= @disable_checks -%> + disable_checks = <%= @disable_checks %> <%- end -%> <%- if @disable_notifications -%> - disable_notifications = <%= @disable_notifications -%> + disable_notifications = <%= @disable_notifications %> <%- end -%> <%- if @period -%> period = "<%= @period -%>" diff --git a/templates/object_host.conf.erb b/templates/object_host.conf.erb index 130797b..cc5c1ab 100644 --- a/templates/object_host.conf.erb +++ b/templates/object_host.conf.erb @@ -37,34 +37,34 @@ object Host "<%= @object_hostname %>" { check_command = "<%= @check_command -%>" <%- end -%> <%- if @max_check_attempts -%> - max_check_attempts = <%= @max_check_attempts -%> + max_check_attempts = <%= @max_check_attempts %> <%- end -%> <%- if @check_period -%> - check_period = <%= @check_period -%> + check_period = <%= @check_period %> <%- end -%> <%- if @check_interval -%> - check_interval = <%= @check_interval -%> + check_interval = <%= @check_interval %> <%- end -%> <%- if @retry_interval -%> - retry_interval = <%= @retry_interval -%> + retry_interval = <%= @retry_interval %> <%- end -%> <%- if @enable_notifications -%> - enable_notifications = <%= @enable_notifications -%> + enable_notifications = <%= @enable_notifications %> <%- end -%> <%- if @enable_active_checks -%> - enable_active_checks = <%= @enable_active_checks -%> + enable_active_checks = <%= @enable_active_checks %> <%- end -%> <%- if @enable_passive_checks -%> - enable_passive_checks = <%= @enable_passive_checks -%> + enable_passive_checks = <%= @enable_passive_checks %> <%- end -%> <%- if @enable_event_handler -%> - enable_event_handler = <%= @enable_event_handler -%> + enable_event_handler = <%= @enable_event_handler %> <%- end -%> <%- if @enable_flapping -%> - enable_flapping = <%= @enable_flapping -%> + enable_flapping = <%= @enable_flapping %> <%- end -%> <%- if @enable_perfdata -%> - enable_perfdata = <%= @enable_perfdata -%> + enable_perfdata = <%= @enable_perfdata %> <%- end -%> <%- if @event_command -%> event_command = "<%= @event_command -%>" diff --git a/templates/object_hostgroup.conf.erb b/templates/object_hostgroup.conf.erb index daa70d3..4eac0eb 100644 --- a/templates/object_hostgroup.conf.erb +++ b/templates/object_hostgroup.conf.erb @@ -23,9 +23,9 @@ object HostGroup "<%= @object_hostgroup_name %>" { groups = [ <%- @groups.each do |group| -%> "<%= group %>", <%- end -%>] <%- end -%> <%- if @assign_where -%> - assign where <%= @assign_where -%> + assign where <%= @assign_where %> <%- end -%> <%- if @ignore_where -%> - ignore where <%= @ignore_where -%> + ignore where <%= @ignore_where %> <%- end -%> } diff --git a/templates/object_notification.conf.erb b/templates/object_notification.conf.erb index 014c0ea..ee78d2f 100644 --- a/templates/object_notification.conf.erb +++ b/templates/object_notification.conf.erb @@ -54,11 +54,11 @@ object Notification "<%= @object_notificationname %>" { <%- end -%> <%- if @interval -%> - interval = <%= @inteval -%> + interval = <%= @inteval %> <%- end -%> <%- if @period -%> - period = <%= @period -%> + period = <%= @period %> <%- end -%> <%- if @types.empty? !=true -%> diff --git a/templates/object_scheduleddowntime.conf.erb b/templates/object_scheduleddowntime.conf.erb index 4793aeb..88e2875 100644 --- a/templates/object_scheduleddowntime.conf.erb +++ b/templates/object_scheduleddowntime.conf.erb @@ -25,7 +25,7 @@ object ScheduledDowntime "<%= @object_scheduleddowntimename %>" { fixed = false <%- end -%> <%- if @duration -%> - duration = <%= @duration -%> + duration = <%= @duration %> <%- end -%> <%- if @ranges.empty? != true -%> diff --git a/templates/object_service.conf.erb b/templates/object_service.conf.erb index f9d71a5..5c5f3b3 100644 --- a/templates/object_service.conf.erb +++ b/templates/object_service.conf.erb @@ -34,34 +34,34 @@ object Service "<%= @object_servicename %>" { check_command = "<%= @check_command -%>" <%- end -%> <%- if @max_check_attempts -%> - max_check_attempts = <%= @max_check_attempts -%> + max_check_attempts = <%= @max_check_attempts %> <%- end -%> <%- if @check_period -%> - check_period = <%= @check_period -%> + check_period = <%= @check_period %> <%- end -%> <%- if @check_interval -%> - check_interval = <%= @check_interval -%> + check_interval = <%= @check_interval %> <%- end -%> <%- if @retry_interval -%> - retry_interval = <%= @retry_interval -%> + retry_interval = <%= @retry_interval %> <%- end -%> <%- if @enable_notifications -%> - enable_notifications = <%= @enable_notifications -%> + enable_notifications = <%= @enable_notifications %> <%- end -%> <%- if @enable_active_checks -%> - enable_active_checks = <%= @enable_active_checks -%> + enable_active_checks = <%= @enable_active_checks %> <%- end -%> <%- if @enable_passive_checks -%> - enable_passive_checks = <%= @enable_passive_checks -%> + enable_passive_checks = <%= @enable_passive_checks %> <%- end -%> <%- if @enable_event_handler -%> - enable_event_handler = <%= @enable_event_handler -%> + enable_event_handler = <%= @enable_event_handler %> <%- end -%> <%- if @enable_flapping -%> - enable_flapping = <%= @enable_flapping -%> + enable_flapping = <%= @enable_flapping %> <%- end -%> <%- if @enable_perfdata -%> - enable_perfdata = <%= @enable_perfdata -%> + enable_perfdata = <%= @enable_perfdata %> <%- end -%> <%- if @event_command -%> event_command = "<%= @event_command -%>" diff --git a/templates/object_servicegroup.conf.erb b/templates/object_servicegroup.conf.erb index 7cebc4e..7183a7c 100644 --- a/templates/object_servicegroup.conf.erb +++ b/templates/object_servicegroup.conf.erb @@ -23,9 +23,9 @@ object ServiceGroup "<%= @object_servicegroup_name %>" { groups = [ <%- @groups.each do |group| -%> "<%= group %>", <%- end -%>] <%- end -%> <%- if @assign_where -%> - assign where <%= @assign_where -%> + assign where <%= @assign_where %> <%- end -%> <%- if @ignore_where -%> - ignore where <%= @ignore_where -%> + ignore where <%= @ignore_where %> <%- end -%> } diff --git a/templates/object_statusdatawriter.conf.erb b/templates/object_statusdatawriter.conf.erb index 6cca1b0..610b7f6 100644 --- a/templates/object_statusdatawriter.conf.erb +++ b/templates/object_statusdatawriter.conf.erb @@ -22,6 +22,6 @@ object StatusDataWriter "<%= @object_statusdatawritername %>" { objects_path = "<%= @objects_path -%>" <%- end -%> <%- if @update_interval -%> - update_interval = <%= @update_interval -%> + update_interval = <%= @update_interval %> <%- end -%> } diff --git a/templates/object_user.conf.erb b/templates/object_user.conf.erb index bd0992b..0965295 100644 --- a/templates/object_user.conf.erb +++ b/templates/object_user.conf.erb @@ -26,7 +26,7 @@ object User "<%= @object_username %>" { pager = "<%= @pager -%>" <%- end -%> <%- if @enable_notifications -%> - enable_notifications = <%= @enable_notifications -%> + enable_notifications = <%= @enable_notifications %> <%- end %> <%- if @vars.empty? != true -%> <%- @vars.each_pair do |key, value| -%> From e9a566df3feb9998ef263efa89153042ecd821fe Mon Sep 17 00:00:00 2001 From: Nick Chappell Date: Tue, 18 Nov 2014 22:30:47 -0800 Subject: [PATCH 2/2] CHANGELOG update. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a806f71..08861cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ * Feature: [PR-48](https://github.com/Icinga/puppet-icinga2/pull/48) and [dev.icinga.org issue #7222](https://dev.icinga.org/issues/7222): Added a defined type for LiveStatusListener objects * Feature: [PR-49](https://github.com/Icinga/puppet-icinga2/pull/49) and [dev.icinga.org issue #7223](https://dev.icinga.org/issues/7223): Added a defined type for StatusDataWriter objects * Feature: [PR-50](https://github.com/Icinga/puppet-icinga2/pull/50) and [dev.icinga.org issue #7224](https://dev.icinga.org/issues/7224): Added a defined type for ExternalCommandListener objects +* Fix: [dev.icinga.org issue #7715](https://dev.icinga.org/issues/7715): Allow trailing whitespace after some parameters so that the parameters following it don't get squashed onto the same line. ###v0.5 (August 17th, 2014)