CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## [10.0.0](https://github.com/theforeman/puppet-dns/tree/10.0.0) (2023-05-10)
+## [10.1.0](https://github.com/theforeman/puppet-dns/tree/10.1.0) (2023-09-18)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/10.0.0...10.1.0)
+
+**Implemented enhancements:**
+
+- Relax dependencies [\#236](https://github.com/theforeman/puppet-dns/pull/236) ([smortex](https://github.com/smortex))
+
+**Fixed bugs:**
+
+- Change sysconfig\_file for Debian/Ubuntu to '/etc/default/named' [\#238](https://github.com/theforeman/puppet-dns/pull/238) ([ekohl](https://github.com/ekohl))
+
+## [10.0.0](https://github.com/theforeman/puppet-dns/tree/10.0.0) (2023-05-15)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/9.6.0...10.0.0)
 

manifests/params.pp

@@ -20,7 +20,11 @@
         'Ubuntu' => if versioncmp($facts['os']['release']['major'], '22.04') >= 0 { '/usr/bin/named-checkconf' } else { '/usr/sbin/named-checkconf' },
         default  => '/usr/sbin/named-checkconf',
       }
-      $sysconfig_file     = '/etc/default/bind9'
+      $sysconfig_file     = $facts['os']['name'] ? {
+        'Debian' => if versioncmp($facts['os']['release']['major'], '11') >= 0 { '/etc/default/named' } else { '/etc/default/bind9' },
+        'Ubuntu' => if versioncmp($facts['os']['release']['major'], '20.04') >= 0 { '/etc/default/named' } else { '/etc/default/bind9' },
+        default  => '/etc/default/named',
+      }
       $sysconfig_template = "dns/sysconfig.${facts['os']['family']}.erb"
       $sysconfig_startup_options = '-u bind'
       $sysconfig_resolvconf_integration = false

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",
@@ -18,11 +18,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 4.1.0 < 9.0.0"
+      "version_requirement": ">= 4.1.0 < 10.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 9.0.0"
+      "version_requirement": ">= 4.13.1 < 10.0.0"
     }
   ],
   "requirements": [

spec/classes/dns_init_spec.rb

@@ -409,7 +409,12 @@
           when 'RedHat'
             '/etc/sysconfig/named'
           when 'Debian'
-            '/etc/default/bind9'
+            case facts[:os]['name']
+            when 'Debian'
+              facts[:os]['release']['major'] == '10' ? '/etc/default/bind9' : '/etc/default/named'
+            when 'Ubuntu'
+              facts[:os]['release']['major'] == '18.04' ? '/etc/default/bind9' : '/etc/default/named'
+            end
           end
         end