CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [10.4.0](https://github.com/theforeman/puppet-dns/tree/10.4.0) (2024-05-15)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/10.3.0...10.4.0)
+
+**Implemented enhancements:**
+
+- Add support for zone masterfile format [\#248](https://github.com/theforeman/puppet-dns/pull/248) ([jfroche](https://github.com/jfroche))
+
 ## [10.3.0](https://github.com/theforeman/puppet-dns/tree/10.3.0) (2024-02-19)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/10.2.0...10.3.0)

manifests/zone.pp

@@ -63,6 +63,8 @@
 # @param auto_dnssec
 # @param dnssec_policy
 #   Causes the zone to be signed and turns on automatic maintenance for the zone.
+# @param masterfile_format
+#   The format used to load the master file
 #
 define dns::zone (
   Array[String] $target_views                             = [],
@@ -101,6 +103,7 @@
   Optional[Enum['yes', 'no']] $dnssec_secure_to_insecure  = undef,
   Optional[Enum['allow', 'maintain', 'off']] $auto_dnssec = undef,
   Optional[String[1]] $dnssec_policy                      = undef,
+  Optional[Enum['text', 'raw', 'map']] $masterfile_format = undef,
 ) {
   $_contact = pick($contact, "root.${zone}.")
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "10.3.0",
+  "version": "10.4.0",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",

spec/defines/dns_zone_spec.rb

@@ -475,6 +475,23 @@
         ])
         end
       end
+
+      context 'zone format defined' do
+        let(:params) { {
+          :masterfile_format => 'text',
+        } }
+
+        it "should have valid zone configuration" do
+          verify_concat_fragment_exact_contents(catalogue, 'dns_zones+10__GLOBAL__example.com.dns', [
+          'zone "example.com" {',
+          '    type master;',
+          "    file \"#{zonefilepath}/db.example.com\";",
+          '    masterfile-format text;',
+          '};',
+        ])
+        end
+      end
+
     end
   end
 end

templates/named.zone.erb

@@ -63,5 +63,8 @@ zone "<%= @zone %>" {
 <% if @_dns_notify -%>
     notify <%= @_dns_notify %>;
 <% end -%>
+<% if @masterfile_format -%>
+    masterfile-format <%= @masterfile_format %>;
+<% end -%>
 <% end -%>
 };