Merge remote-tracking branch 'hdeadman/forwarderport' into 6.0-prerelease

This commit is contained in:
Nate Riffe 2016-04-20 07:39:32 -05:00
commit 8348f42a17
2 changed files with 2 additions and 1 deletions

View File

@ -18,6 +18,7 @@ define bind::zone (
$forwarders = '', $forwarders = '',
$forward = '', $forward = '',
$source = '', $source = '',
$forwarders_port = 53,
) { ) {
# where there is a zone, there is a server # where there is a zone, there is a server
include bind include bind

View File

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