Merge pull request #18 from klti/pr-view-improvements

I'm not familiar with the "match-recursive-only" directive, but this all seems reasonable.
This commit is contained in:
Nate Riffe 2015-01-12 11:50:50 -06:00
commit 0f12e399bb
2 changed files with 6 additions and 1 deletions

View File

@ -7,11 +7,13 @@ define bind::view (
$recursion = true,
$recursion_match_clients = 'any',
$recursion_match_destinations = '',
$recursion_match_only = false,
$order = '10',
) {
$confdir = $::bind::confdir
concat::fragment { "bind-view-${name}":
order => '10',
order => $order,
target => "${::bind::confdir}/views.conf",
content => template('bind/view.erb'),
}

View File

@ -15,6 +15,9 @@ view "<%= @name %>" {
};
<%- end -%>
recursion <%= @recursion ? 'yes' : 'no' %>;
<%- if @recursion_match_only -%>
match-recursive-only yes;
<%- end -%>
<%- if @recursion -%>
<%- if @recursion_match_clients and @recursion_match_clients != '' -%>
allow-recursion {