From fcb310ed72d3b6dadc73ca14ff9d91cd1e35ced3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 3 Sep 2024 12:12:51 +0800 Subject: [PATCH 1/2] Include systemd module for Amazon Linux 2023 --- manifests/default_mods.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp index 474b53748..f970d98cc 100644 --- a/manifests/default_mods.pp +++ b/manifests/default_mods.pp @@ -16,7 +16,7 @@ if $facts['os']['name'] != 'Amazon' and $use_systemd { ::apache::mod { 'systemd': } } - if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['full'] == '2') { + if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =~ /^(2|2023)$/) { ::apache::mod { 'systemd': } } ::apache::mod { 'unixd': } From f23433948e0bfd52169ba3f7cd026c89c80d458c Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 5 Sep 2024 13:01:04 +0800 Subject: [PATCH 2/2] always include systemd module when $use_systemd is true --- manifests/default_mods.pp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifests/default_mods.pp b/manifests/default_mods.pp index f970d98cc..50f04ba26 100644 --- a/manifests/default_mods.pp +++ b/manifests/default_mods.pp @@ -13,10 +13,7 @@ case $facts['os']['family'] { 'RedHat': { ::apache::mod { 'log_config': } - if $facts['os']['name'] != 'Amazon' and $use_systemd { - ::apache::mod { 'systemd': } - } - if ($facts['os']['name'] == 'Amazon' and $facts['os']['release']['major'] =~ /^(2|2023)$/) { + if $use_systemd { ::apache::mod { 'systemd': } } ::apache::mod { 'unixd': }