From bb4f210c44f197b13228726589493160c49b4134 Mon Sep 17 00:00:00 2001 From: Tom Ford Date: Fri, 8 Jul 2016 15:04:04 +0100 Subject: [PATCH 1/2] Allow forwarders to be set for master/slave zones --- manifests/zone.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/zone.pp b/manifests/zone.pp index 27d68ac..98e3e6d 100644 --- a/manifests/zone.pp +++ b/manifests/zone.pp @@ -69,12 +69,12 @@ define bind::zone ( fail("allow_notify may only be provided for bind::zone resources with zone_type 'slave' or 'stub'") } - unless !($forwarders != '' and $zone_type != 'forward') { - fail("forwarders may only be provided for bind::zone resources with zone_type 'forward'") + unless !($forwarders != '' and ! member(['master', 'slave', 'forward'], $zone_type)) { + fail("forwarders may only be provided for bind::zone resources with zone_type 'forward' or 'master' or 'slave'") } - unless !($forward != '' and $zone_type != 'forward') { - fail("forward may only be provided for bind::zone resources with zone_type 'forward'") + unless !($forward != '' and ! member(['master', 'slave', 'forward'], $zone_type)) { + fail("forward may only be provided for bind::zone resources with zone_type 'forward' or 'master' or 'slave'") } unless !($source != '' and ! member(['master', 'hint'], $zone_type)) { From 9cd83cc317fc5783887d9a71ff3d9cfdf681dfd4 Mon Sep 17 00:00:00 2001 From: Tom Ford Date: Fri, 8 Jul 2016 15:07:15 +0100 Subject: [PATCH 2/2] Allow an empty forwarders {} statement --- templates/zone.conf.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/zone.conf.erb b/templates/zone.conf.erb index 5d94788..8a36dd7 100644 --- a/templates/zone.conf.erb +++ b/templates/zone.conf.erb @@ -73,8 +73,10 @@ zone "<%= @_domain %>" { <%- end -%> <%- if @forwarders and @forwarders != '' -%> forwarders { +<%- if @forwarders != 'none' -%> <%- Array(@forwarders).each do |forwarder| -%> <%= forwarder %><%-if @forwarders_port != 53 -%> port <%= @forwarders_port %><%- end -%>; +<%- end -%> <%- end -%> }; <%- end -%>