From b05a8e4c030cc9571e8493ff60c179d8d207efd3 Mon Sep 17 00:00:00 2001 From: Christoph Maser Date: Wed, 5 Jun 2024 11:13:58 +0200 Subject: [PATCH] Add Debian 12 support --- metadata.json | 3 ++- spec/acceptance/class_spec.rb | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/metadata.json b/metadata.json index b07968114..8c5633f5e 100644 --- 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 index eaf361574..a8941590f 100644 --- 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}