Skip to content

allow ACLS to be used in zone configuration options #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ikonia wants to merge 3 commits into
base: master
Choose a base branch
from
+11 −12
Open

allow ACLS to be used in zone configuration options #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3138e8
solve concat fragment validation on acls:
ikonia May 24, 2026
b52a3de
reorder acls to be available in zones.pp
ikonia May 24, 2026
f05a059
formatting change, missunderstood style
ikonia May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions manifests/config.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
16 changes: 8 additions & 8 deletions templates/named.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') %>";
Expand All @@ -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| -%>
Expand Down
Loading