Merge pull request #1600 from TheMeier/debian12

Add Debian 12 support
voxpupuli · Jun 5, 2024 · 61c272e · 61c272e
2 parents 417c599 + b05a8e4
commit 61c272e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/metadata.json b/metadata.json
@@ -27,7 +27,8 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "11"
+        "11",
+        "12"
       ]
     },
     {

diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
@@ -9,17 +9,12 @@
   when 'RedHat'
     pkg_cmd = 'yum info nginx | grep "^From repo"'
     pkg_remove_cmd = 'yum -y remove nginx nginx-filesystem passenger'
-    pkg_match = case fact('operatingsystemmajrelease')
-                when '7' # https://blog.phusion.nl/2020/05/29/passenger-6-0-5/
-                  %r{epel}
-                else
-                  test_passenger = false
-                end
+    test_passenger = false
   when 'Debian'
     pkg_cmd = 'dpkg -s nginx | grep ^Maintainer'
     pkg_remove_cmd = 'apt-get -y purge nginx nginx-common'
-    pkg_match = case fact('operatingsystemmajrelease')
-                when '11'
+    pkg_match = case fact('os.release.major')
+                when '11', '12'
                   %r{Debian Nginx Maintainers}
                 when '18.04', '20.04', '22.04'
                   %r{Ubuntu Developers}