unkinben/puppet-bind
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99 from exptom/patch-2

Browse Source 
Allow master/slave zones to set forwarders
This commit is contained in:
Nate Riffe 2016-07-08 19:09:51 -05:00 committed by GitHub
commit 41197b03e0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/zone.pp
View File

@ -69,12 +69,12 @@ define bind::zone (
fail("allow_notify may only be provided for bind::zone resources with zone_type 'slave' or 'stub'") fail("allow_notify may only be provided for bind::zone resources with zone_type 'slave' or 'stub'")
} }
unless !($forwarders != '' and $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'") fail("forwarders may only be provided for bind::zone resources with zone_type 'forward' or 'master' or 'slave'")
} }
unless !($forward != '' and $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'") 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)) { unless !($source != '' and ! member(['master', 'hint'], $zone_type)) {

2
templates/zone.conf.erb
View File

@ -73,8 +73,10 @@ zone "<%= @_domain %>" {
<%- end -%> <%- end -%>
<%- if @forwarders and @forwarders != '' -%> <%- if @forwarders and @forwarders != '' -%>
forwarders { forwarders {
<%- if @forwarders != 'none' -%>
<%- Array(@forwarders).each do |forwarder| -%> <%- Array(@forwarders).each do |forwarder| -%>
<%= forwarder %><%-if @forwarders_port != 53 -%> port <%= @forwarders_port %><%- end -%>; <%= forwarder %><%-if @forwarders_port != 53 -%> port <%= @forwarders_port %><%- end -%>;
<%- end -%>
<%- end -%> <%- end -%>
}; };
<%- end -%> <%- end -%>