Merge branch 'query-control'

This commit is contained in:
Nate Riffe 2017-01-29 16:10:27 -06:00
commit 6cccd47c84
2 changed files with 32 additions and 0 deletions

View File

@ -9,6 +9,10 @@ define bind::view (
$recursion_match_clients = 'any', $recursion_match_clients = 'any',
$recursion_match_destinations = '', $recursion_match_destinations = '',
$recursion_match_only = false, $recursion_match_only = false,
$allow_query = 'any',
$allow_query_on = 'any',
$allow_query_cache = 'any',
$allow_query_cache_on = 'any',
$allow_transfers = '', $allow_transfers = '',
$notify_source = '', $notify_source = '',
$also_notify = '', $also_notify = '',

View File

@ -33,6 +33,34 @@ view "<%= @name %>" {
<%- end -%> <%- end -%>
}; };
<%- end -%> <%- end -%>
<%- if @allow_query and @allow_query != '' -%>
allow-query {
<%- Array(@allow_query).each do |query_client| -%>
<%= query_client %>;
<%- end -%>
};
<%- end -%>
<%- if @allow_query_on and @allow_query_on != '' -%>
allow-query-on {
<%- Array(@allow_query_on).each do |query_server| -%>
<%= match_server %>;
<%- end -%>
};
<%- end -%>
<%- if @allow_query_cache and @allow_query_cache != '' -%>
allow-query-cache {
<%- Array(@allow_query_cache).each do |query_client| -%>
<%= query_client %>;
<%- end -%>
};
<%- end -%>
<%- if @allow_query_cache_on and @allow_query_cache_on != '' -%>
allow-query-cache-on {
<%- Array(@allow_query_cache_on).each do |query_server| -%>
<%= query_server %>;
<%- end -%>
};
<%- end -%>
<%- end -%> <%- end -%>
<%- if @allow_transfers and @allow_transfers != '' -%> <%- if @allow_transfers and @allow_transfers != '' -%>
allow-transfer { allow-transfer {