update tsig key locality

icann-dns · Aug 8, 2016 · 210532a · 210532a
1 parent 66a56c7
commit 210532a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/manifests/zone.pp b/manifests/zone.pp
@@ -8,6 +8,7 @@
   $zones            = [],
   $zonefile         = undef,
   $zone_dir         = undef,
+  $tsig_name        = undef,
 ) {
 
   validate_array($masters)
@@ -25,6 +26,16 @@
   } else {
     $zone_subdir = $::knot::zone_subdir
   }
+  if $tsig_name {
+    validate_string($tsig_name)
+    if defined(Knot::Tsig[$tsig_name]) {
+      $_tsig_name = $tsig_name
+    } else {
+      fail("Nsd::Tsig['${tsig_name}'] does not exist")
+    }
+  } elsif has_key($::knot::tsig, 'name') {
+    $_tsig_name = $::knot::tsig['name']
+  }
   concat::fragment{ "knot_zones_${name}":
     target  => $::knot::conf_file,
     content => template($::knot::zones_template),

diff --git a/templates/etc/knot/knot.zones.conf.erb b/templates/etc/knot/knot.zones.conf.erb
@@ -3,8 +3,8 @@ remotes {
   xfr-in-<%= @name %><%= index + 1 %> {
     address <%= master %>; 
     port 53;
-    <%- if @tsig then -%>
-    key <%= @tsig['name'] %>;
+    <%- if @_tsig_name then -%>
+    key <%= @_tsig_name %>;
     <%- end -%>
   }
 <%- end -%>