From b3138e80fcf5c3859a85468abc7e40f2238cf520 Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Sun, 24 May 2026 09:18:57 +0100
Subject: [PATCH 1/3] solve concat fragment validation on acls:

---
 manifests/config.pp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index bfe6b33..e617cda 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -11,7 +11,6 @@
     owner        => root,
     group        => $dns::params::group,
     mode         => '0640',
-    validate_cmd => $validate_cmd,
   }
 
   if $dns::enable_views {

From b52a3def89c5e9d61bbc0a055617c373dc3009bb Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Sun, 24 May 2026 09:20:09 +0100
Subject: [PATCH 2/3] reorder acls to be available in zones.pp

---
 templates/named.conf.erb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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| -%>

From f05a0597c5ae69db2d255d83e6ef4165cbaba910 Mon Sep 17 00:00:00 2001
From: Matt Darcy <matt@projecthugo.co.uk>
Date: Sun, 24 May 2026 20:17:48 +0100
Subject: [PATCH 3/3] formatting change, missunderstood style

---
 manifests/config.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index e617cda..0c6f9b4 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -8,9 +8,9 @@
   }
 
   concat { $dns::publicviewpath:
-    owner        => root,
-    group        => $dns::params::group,
-    mode         => '0640',
+    owner => root,
+    group => $dns::params::group,
+    mode  => '0640',
   }
 
   if $dns::enable_views {