Showing with 18 additions and 4 deletions.

+5 −0 .github/workflows/ci.yml

+9 −0 CHANGELOG.md

+1 −1 manifests/init.pp

+1 −1 manifests/params.pp

+1 −1 metadata.json

+1 −1 spec/classes/dns_init_spec.rb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,11 @@ name: CI
 
 on:
   pull_request:
+  push:
+    branches:
+      - 'develop'
+      - 'master'
+      - '*-stable'
 
 
 concurrency:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [11.0.1](https://github.com/theforeman/puppet-dns/tree/11.0.1) (2024-11-04)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/11.0.0...11.0.1)
+
+**Fixed bugs:**
+
+- BIND 9.18 compatiblity on Ubuntu 20.04 [\#267](https://github.com/theforeman/puppet-dns/pull/267) ([ekohl](https://github.com/ekohl))
+- Fix the documentation of the disable\_empty\_zones parameter [\#265](https://github.com/theforeman/puppet-dns/pull/265) ([bigon](https://github.com/bigon))
+
 ## [11.0.0](https://github.com/theforeman/puppet-dns/tree/11.0.0) (2024-07-18)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/10.4.0...11.0.0)

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -135,7 +135,7 @@
 # @param logging_channels
 #   A hash of logging channels to be created. See dns::logging::channel for options.
 # @param disable_empty_zones
-#   A hash containing a list of empty zones that shouldn't be created by bind
+#   A list of empty zones that shouldn't be created by bind
 #   See: https://kb.isc.org/docs/aa-00800
 #
 # @see dns::zone

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -17,7 +17,7 @@
       $group              = 'bind'
       $rndcconfgen        = '/usr/sbin/rndc-confgen'
       $named_checkconf    = $facts['os']['name'] ? {
-        'Ubuntu' => if versioncmp($facts['os']['release']['major'], '22.04') >= 0 { '/usr/bin/named-checkconf' } else { '/usr/sbin/named-checkconf' },
+        'Ubuntu' => '/usr/bin/named-checkconf',
         default  => if versioncmp($facts['os']['release']['major'], '12') >= 0 { '/usr/bin/named-checkconf' } else { '/usr/sbin/named-checkconf' },
       }
       $sysconfig_file     = '/etc/default/named'

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",

diff --git a/spec/classes/dns_init_spec.rb b/spec/classes/dns_init_spec.rb
@@ -32,7 +32,7 @@
       let(:checkconf) {
         case facts[:os]['family']
         when 'Debian'
-          ['22.04', '12'].include?(facts[:os]['release']['major']) ? "/usr/bin/named-checkconf" : "/usr/sbin/named-checkconf"
+          facts[:os]['release']['major'] != '11' ? "/usr/bin/named-checkconf" : "/usr/sbin/named-checkconf"
         when 'FreeBSD'
           '/usr/local/sbin/named-checkconf'
         else