Merge pull request #1514 from voxpupuli/ubuntu2204

voxpupuli · Aug 24, 2022 · 65a83a8 · 65a83a8
2 parents 113f3d2 + 6e25548
commit 65a83a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/metadata.json b/metadata.json
@@ -80,7 +80,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "18.04",
-        "20.04"
+        "20.04",
+        "22.04"
       ]
     }
   ]

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -23,7 +23,7 @@
     pkg_match = case fact('operatingsystemmajrelease')
                 when '10', '11'
                   %r{Debian Nginx Maintainers}
-                when '18.04', '20.04'
+                when '18.04', '20.04', '22.04'
                   %r{Ubuntu Developers}
                 else
                   %r{Phusion}

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -190,8 +190,8 @@
 
             it { is_expected.to contain_package('nginx') }
 
-            if (facts[:lsbdistid] == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) ||
-               (facts[:lsbdistid] == 'Ubuntu' && %w[bionic focal].include?(facts[:lsbdistcodename]))
+            if (facts.dig(:os, 'name') == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) ||
+               (facts.dig(:os, 'name') == 'Ubuntu' && %w[bionic focal jammy].include?(facts.dig(:os, 'distro', 'codename')))
               it { is_expected.to contain_package('libnginx-mod-http-passenger') }
             else
               it { is_expected.to contain_package('passenger') }