start knot2 compatibility work. refs #3

manifests/init.pp

@@ -81,6 +81,7 @@
 #   Log statement hash. See https://www.knot-dns.cz/documentation/html/reference.html#log-statement
 #
 # [*interfaces*]
+# This setting is here to keep the backwards compatibility. Since version 2.0 this has been part of system variable.
 #   Default:
 #     $interfaces = {
 #       all_ipv4  => {

manifests/params.pp

@@ -79,12 +79,12 @@
       'port'    => 53,
     },
     'all_ipv6'  => {
-      'address' => '[::]',
+      'address' => '::',
       'port'    => 53,
     }
   }
   $control = {
-    'listen-on' => 'knot.sock'
+    'listen' => 'knot.sock'
   }
   $zone_storage = '/var/lib/knot'
   $dnssec_keydir = '/etc/knot/dnssec_keys.d'

templates/knot.conf.erb

@@ -1,74 +1,28 @@
 # THIS CONFIGURATION IS MANAGED BY PUPPET
 # see man 5 knot.conf for all available configuration options
-system {
-  user <%= @service_user %>.<%= @service_group %>;
-<%- @system.each do |k,v| -%>
-  <%= k %> <%= v %>;
-<%- end -%>
-}
+<%- require 'yaml' -%>
 
-<%- if @keys -%>
-keys {
-<%- @keys.each do |k,v| -%>
-  <%= k %> <%= v['algorithm'] %> "<%= v['key'] %>";
-<%- end -%>
-}
-<%- end -%>
+server:
+    user: <%= @service_user %>:<%= @service_group %>
+    <%- @system.each do |k,v| -%>
+    <%= k %>: <%= v %>
+    <%- end -%>
+    <%- @interfaces.each do |k,v| -%>
+    listen: <%= v['address'] %>@<%= v['port'] %>
+    <%- end -%>
 
-interfaces {
-<%- @interfaces.each do |k,v| -%>
-  <%= k -%> {
-  <%- v.each do |y,z| -%>
-    <%= y %> <%= z %>;
-  <%- end -%>
-  }
-<%- end -%>
-}
-
-<%- if @remotes -%>
-remotes {
-<%- @remotes.each do |k,v| -%>
-  <%= k -%> {
-  <%- v.each do |y,z| -%>
-    <%= y %> <%= z %>;
-  <%- end -%>
-  }
-<%- end -%>
-}
-<%- end -%>
+log:
+<%- @log.each do |k,v| -%>
+    - target: <%= k -%>
 
-<%- if @groups -%>
-groups {
-<%- @groups.each do |k,v| -%>
-  <%= k %> { <%= v %> }
-<%- end -%>
-}
+    <%- v.each do |y,z| -%>
+      <%= y %>: <%= z %>
+    <%- end -%>
 <%- end -%>
 
-control {
+control:
 <%- @control.each do |k,v| -%>
-  <%= k %> <%= v %>;
-<%- end -%>
-}
-
-zones {
-  storage "<%= @zone_storage %>";
-<%- if @dnssec_enable -%>
-  dnssec-enable on;
-  dnssec-keydir "<%= @dnssec_keydir %>";
+    <%= k %>: <%= v %>
 <%- end -%>
-<%- if @zone_options then @zone_options.each do |k,v| -%>
-  <%= k %> <%= v %>;
-<%- end end -%>
-  include "<%= @zones_file %>";
-}
 
-log {
-<%- @log.each do |k,v| -%>
-  <%= k -%> {
-  <%- v.each do |y,z| -%>
-    <%= y %> <%= z %>;
-  <%- end -%>
-  }
-<%- end -%>
-}
+include: "<%= @zones_config_file %>"

templates/zones.conf.erb

@@ -1,14 +1,16 @@
 # THIS CONFIGURATION IS MANAGED BY PUPPET
 # see man 5 knot.conf for all available configuration options
-<%- @zones.each do |k,v| -%>
-<%= k -%> {
-  file "<%= k.gsub(/\//, "_") -%>.zone";
-<%- if (@zone_defaults && v && v.length > 0) then _v = @zone_defaults.merge(v) -%>
-<%- elsif (v && v.length > 0) then _v = v -%>
-<%- elsif (@zone_defaults && @zone_defaults.length > 0) then _v = @zone_defaults -%>
-<%- end -%>
-<%- if (_v && _v.length > 0) then _v.each do |y,z| -%>
-  <%= y %> <%= z %>;
-<%- end end -%>
-}
+
+zone:
+    <%- @zones.each do |k,v| -%>
+    - domain: <%= k -%> 
+      file: "<%= k -%>.zone"
+      <%- if (@zone_defaults && v && v.length > 0) then _v = @zone_defaults.merge(v) -%>
+      <%- elsif (v && v.length > 0) then _v = v -%>
+      <%- elsif (@zone_defaults && @zone_defaults.length > 0) then _v = @zone_defaults -%>
+      <%- end -%>
+      <%- if (_v && _v.length > 0) then _v.each do |y,z| -%>
+      <%= y %>: <%= z %>
+      <%- end end -%>
 <%- end -%>
+

tests/init.pp

@@ -12,6 +12,6 @@
 class { 'knot':
   zones => {  'myzone.net'      => '',
               'myotherzone.com' => {
-                'xfr-out' => 'server1' },
+                'notify' => 'server1' },
   },
 }