Add Debian 12 support

theforeman · Nov 14, 2023 · c740d3d · c740d3d
1 parent 377fa70
commit c740d3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -18,7 +18,7 @@
       $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' },
-        default  => '/usr/sbin/named-checkconf',
+        default  => if versioncmp($facts['os']['release']['major'], '12') >= 0 { '/usr/bin/named-checkconf' } else { '/usr/sbin/named-checkconf' },
       }
       $sysconfig_file     = $facts['os']['name'] ? {
         'Debian' => if versioncmp($facts['os']['release']['major'], '11') >= 0 { '/etc/default/named' } else { '/etc/default/bind9' },

diff --git a/metadata.json b/metadata.json
@@ -64,7 +64,8 @@
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
         "10",
-        "11"
+        "11",
+        "12"
       ]
     },
     {

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'].include?(facts[:os]['release']['major']) ? "/usr/bin/named-checkconf" : "/usr/sbin/named-checkconf"
+          ['22.04', '12'].include?(facts[:os]['release']['major']) ? "/usr/bin/named-checkconf" : "/usr/sbin/named-checkconf"
         when 'FreeBSD'
           '/usr/local/sbin/named-checkconf'
         else
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,8 @@ @@
           "operatingsystem": "Debian",
           "operatingsystemrelease": [
             "10",
-            "11"
+            "11",
+            "12"
           ]
         },
         {
@@ Expand Down @@