From fac900efdfd079707e8d298bbc5d7c6de50b03b7 Mon Sep 17 00:00:00 2001 From: turnopil Date: Wed, 16 Jun 2021 17:33:06 +0300 Subject: [PATCH 1/3] Update the default version of Apache for Amazon Linux 2 - updated minor version --- manifests/version.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/version.pp b/manifests/version.pp index 7ebd591c59..6d2bb24d0b 100644 --- a/manifests/version.pp +++ b/manifests/version.pp @@ -11,8 +11,8 @@ if $scl_httpd_version { $default = $scl_httpd_version } - elsif ($::operatingsystem == 'Amazon') { - $default = '2.2' + elsif ($::operatingsystem == 'Amazon' and $::operatingsystemmajrelease == '2') { + $default = '2.4' } elsif ($::operatingsystem == 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0) { $default = '2.4' } else { From 6dba6aeb7f52a6b5fd4c987ba84bda697c1ba611 Mon Sep 17 00:00:00 2001 From: turnopil Date: Thu, 17 Jun 2021 17:35:39 +0300 Subject: [PATCH 2/3] Update the default version of Apache for Amazon Linux 2 - added Amazon Linux 2 support for passenger module --- manifests/mod/passenger.pp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp index 8cd9e8b36d..d9920a1eb2 100644 --- a/manifests/mod/passenger.pp +++ b/manifests/mod/passenger.pp @@ -837,7 +837,11 @@ if $::osfamily == 'RedHat' and $manage_repo { if $::operatingsystem == 'Amazon' { - $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch' + if $::operatingsystemmajrelease == '2' { + $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7Server/$basearch' + } else { + $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch' + } } else { $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' } From 58bed4493b37aeaab1f79fa66e448754506c2987 Mon Sep 17 00:00:00 2001 From: turnopil Date: Thu, 17 Jun 2021 17:47:46 +0300 Subject: [PATCH 3/3] Update the default version of Apache for Amazon Linux 2 - fixed url --- manifests/mod/passenger.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp index d9920a1eb2..9019c33e41 100644 --- a/manifests/mod/passenger.pp +++ b/manifests/mod/passenger.pp @@ -838,9 +838,9 @@ if $::osfamily == 'RedHat' and $manage_repo { if $::operatingsystem == 'Amazon' { if $::operatingsystemmajrelease == '2' { - $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7Server/$basearch' + $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7/$basearch' } else { - $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch' + $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6/$basearch' } } else { $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'