Merge pull request #619 from traylenator/26

Support Ubuntu 26.06

Author: traylenator

manifests/resolved.pp

@@ -202,7 +202,7 @@
     # Debian 13 started disabling mDNS by default, so we need to override that
     # if we want to manage mDNS. See https://bugs.debian.org/1098914 and
     # https://salsa.debian.org/systemd-team/systemd/-/commit/46432631232015b78071f84e5a3fb944621c83f7
-    if stdlib::os_version_gte('Debian', '13') {
+    if stdlib::os_version_gte('Debian', '13') or stdlib::os_version_gte('Ubuntu', '26') {
       file { '/etc/systemd/resolved.conf.d':
         ensure => directory,
         owner  => 'root',

metadata.json

@@ -31,7 +31,8 @@
       "operatingsystemrelease": [
         "20.04",
         "22.04",
-        "24.04"
+        "24.04",
+        "26.04"
       ]
     },
     {

spec/classes/init_spec.rb

@@ -266,22 +266,25 @@
             )
           end
 
-          context 'on Debian 13 or newer', if: facts[:os]['name'] == 'Debian' && facts[:os]['release']['major'].to_i >= 13 do
+          case [facts[:os]['name'], facts[:os]['release']['major']]
+          when %w[Debian 13], ['Ubuntu', '26.04'] # switch to family case once old debian, ubuntu gone
             it do
               is_expected.to contain_file('/etc/systemd/resolved.conf.d').with(
                 ensure: 'directory',
                 owner: 'root',
                 group: 'root',
                 mode: '0755',
               )
-            end
-
-            it do
               is_expected.to contain_file('/etc/systemd/resolved.conf.d/00-disable-mdns.conf').with(
                 ensure: 'link',
                 target: '/dev/null',
               ).that_notifies('Service[systemd-resolved]')
             end
+          else
+            it do
+              is_expected.not_to contain_file('/etc/systemd/resolved.conf.d')
+              is_expected.not_to contain_file('/etc/systemd/resolved.conf.d/00-disable-mdns.conf')
+            end
           end
         end