From a413230ee7b042860ed25c1b43e7f6edffc3c71f Mon Sep 17 00:00:00 2001 From: Martin Alfke Date: Tue, 14 Mar 2023 12:54:32 +0100 Subject: [PATCH] Add EL 9 to supported OS --- manifests/package/redhat.pp | 2 +- manifests/params.pp | 2 +- metadata.json | 20 ++++++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) 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" ] }, {