diff --git a/manifests/package/redhat.pp b/manifests/package/redhat.pp index b1816bbd0..f6e221109 100644 --- a/manifests/package/redhat.pp +++ b/manifests/package/redhat.pp @@ -66,7 +66,7 @@ } } 'passenger': { - if ($facts['os']['name'] in ['RedHat', 'CentOS', 'VirtuozzoLinux']) and ($facts['os']['release']['major'] in ['6', '7']) { + if ($facts['os']['name'] in ['RedHat', 'CentOS', 'VirtuozzoLinux', 'Rocky', 'AlmaLinux']) and ($facts['os']['release']['major'] in ['6', '7', '8', '9']) { # 2019-11: Passenger changed their gpg key from: `https://packagecloud.io/phusion/passenger/gpgkey` # to: `https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt` # Find the latest key by opening: https://oss-binaries.phusionpassenger.com/yum/definitions/el-passenger.repo diff --git a/manifests/params.pp b/manifests/params.pp index 8b9281178..6c3303984 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -137,7 +137,7 @@ } } 'RedHat': { - if ($facts['os']['name'] in ['RedHat', 'CentOS', 'Oracle', 'virtuozzolinux'] and $facts['os']['release']['major'] in ['6', '7', '8']) { + if ($facts['os']['name'] in ['RedHat', 'CentOS', 'Oracle', 'virtuozzolinux', 'Rocky', 'AlmaLinux'] and $facts['os']['release']['major'] in ['6', '7', '8', '9']) { $_module_os_overrides = { 'manage_repo' => true, 'log_group' => 'nginx', diff --git a/metadata.json b/metadata.json index bbdb65309..72ae2b58b 100644 --- a/metadata.json +++ b/metadata.json @@ -38,14 +38,30 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" + ] + }, + { + "operatingsystem": "Rocky", + "operatingsystemrelease": [ + "8", + "9" + ] + }, + { + "operatingsystem": "AlmaLinux", + "operatingsystemrelease": [ + "8", + "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index be7e65bd2..1cb3e09b1 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -10,12 +10,10 @@ pkg_cmd = 'yum info nginx | grep "^From repo"' pkg_remove_cmd = 'yum -y remove nginx nginx-filesystem passenger' pkg_match = case fact('operatingsystemmajrelease') - when '8' - test_passenger = false when '7' # https://blog.phusion.nl/2020/05/29/passenger-6-0-5/ %r{epel} else - %r{passenger} + test_passenger = false end when 'Debian' pkg_cmd = 'dpkg -s nginx | grep ^Maintainer'