diff --git a/manifests/config.pp b/manifests/config.pp index bfe6b33..0c6f9b4 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -8,10 +8,9 @@ } concat { $dns::publicviewpath: - owner => root, - group => $dns::params::group, - mode => '0640', - validate_cmd => $validate_cmd, + owner => root, + group => $dns::params::group, + mode => '0640', } if $dns::enable_views { diff --git a/templates/named.conf.erb b/templates/named.conf.erb index a4fbc9e..30ff4d2 100644 --- a/templates/named.conf.erb +++ b/templates/named.conf.erb @@ -20,6 +20,14 @@ options { include "<%= scope.lookupvar('::dns::optionspath') %>"; }; +<%- scope.lookupvar('::dns::acls').sort_by {|k, v| k}.each do |acl_name, acl_array| -%> +acl "<%= acl_name %>" { + <%- acl_array.sort.each do |subnet| -%> + <%= subnet %>; + <%- end -%> +}; +<%- end -%> + <% unless scope.lookupvar("::dns::enable_views") -%> <% if scope.lookupvar("::dns::localzonepath") != 'unmanaged' -%> include "<%= scope.lookupvar('::dns::localzonepath') %>"; @@ -28,14 +36,6 @@ include "<%= scope.lookupvar('::dns::localzonepath') %>"; include "<%= scope.lookupvar('::dns::defaultzonepath') %>"; <% end -%> <% end -%> - -<%- scope.lookupvar('::dns::acls').sort_by {|k, v| k}.each do |acl_name, acl_array| -%> -acl "<%= acl_name %>" { - <%- acl_array.sort.each do |subnet| -%> - <%= subnet %>; - <%- end -%> -}; -<%- end -%> <%- if scope.lookupvar('::dns::additional_directives').any? -%> // additional directives <%- scope.lookupvar('::dns::additional_directives').each do |directive| -%>