From 44d79567e6110043338492879f20fc41cb332abe Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden <ewoud@kohlvanwijngaarden.nl>
Date: Tue, 13 Aug 2024 18:41:33 +0200
Subject: [PATCH] BIND 9.18 compatiblity on Ubuntu 20.04

A security update on Ubuntu 20.04 brought BIND 9.18 which moves
named-checkconf from /usr/sbin to /usr/bin.

This removes the need for the conditional because now all supported
versions use /usr/bin.
---
 manifests/params.pp           | 2 +-
 spec/classes/dns_init_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 8d7c120..e2e49eb 100644
--- 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/spec/classes/dns_init_spec.rb b/spec/classes/dns_init_spec.rb
index 3bab0f3..7b84744 100644
--- 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