From c9cb4a7c31eeeade7bf22741c7222df1993fae42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Thu, 18 Aug 2022 15:06:01 -1000 Subject: [PATCH] Add support for Debian 11 --- metadata.json | 3 ++- spec/acceptance/class_spec.rb | 2 +- spec/classes/nginx_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/metadata.json b/metadata.json index 1a9041906..f708ca806 100644 --- a/metadata.json +++ b/metadata.json @@ -27,7 +27,8 @@ { "operatingsystem": "Debian", "operatingsystemrelease": [ - "10" + "10", + "11" ] }, { diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 9fd33660c..f4eb0e213 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -21,7 +21,7 @@ pkg_cmd = 'dpkg -s nginx | grep ^Maintainer' pkg_remove_cmd = 'apt-get -y purge nginx nginx-common' pkg_match = case fact('operatingsystemmajrelease') - when '10' + when '10', '11' %r{Debian Nginx Maintainers} when '18.04', '20.04' %r{Ubuntu Developers} diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb index 5e8f910b4..c1b4f8769 100644 --- a/spec/classes/nginx_spec.rb +++ b/spec/classes/nginx_spec.rb @@ -190,7 +190,7 @@ it { is_expected.to contain_package('nginx') } - if (facts[:lsbdistid] == 'Debian' && %w[9 10].include?(facts.dig(:os, 'release', 'major'))) || + if (facts[:lsbdistid] == 'Debian' && %w[10 11].include?(facts.dig(:os, 'release', 'major'))) || (facts[:lsbdistid] == 'Ubuntu' && %w[bionic focal].include?(facts[:lsbdistcodename])) it { is_expected.to contain_package('libnginx-mod-http-passenger') } else