From e0a5e06b10dcd3847e3e25a2c7d98307106ae3e0 Mon Sep 17 00:00:00 2001 From: Mike Riddle Date: Wed, 7 Feb 2024 12:02:25 -0500 Subject: [PATCH 1/3] [puppetsync] Update metadata upper bounds for puppet-nsswitch, puppet-gitlab, puppet-snmp, simp-pam, and simp-useradd The patch enforces a standardized asset baseline using simp/puppetsync, and may also apply other updates to ensure conformity. --- CHANGELOG | 3 +++ metadata.json | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 42bdc40..1674cc9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +* Wed Feb 07 2024 Steven Pritchard - 0.5.0 +- [puppetsync] Add EL9 support + * Wed Oct 11 2023 Steven Pritchard - 0.4.0 - [puppetsync] Updates for Puppet 8 - These updates may include the following: diff --git a/metadata.json b/metadata.json index 291d0da..e9884c4 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-rkhunter", - "version": "0.4.0", + "version": "0.5.0", "author": "SIMP Team", "summary": "A SIMP puppet module for managing rkhunter", "license": "Apache-2.0", @@ -25,33 +25,38 @@ "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "Rocky", "operatingsystemrelease": [ - "8" + "8", + "9" ] }, { "operatingsystem": "AlmaLinux", "operatingsystemrelease": [ - "8" + "8", + "9" ] } ], From 8bc699c94a6c52309f18130f08507c3c62b445ee Mon Sep 17 00:00:00 2001 From: Mike Riddle Date: Wed, 7 Feb 2024 17:08:27 -0500 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1674cc9..5c3c501 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -* Wed Feb 07 2024 Steven Pritchard - 0.5.0 -- [puppetsync] Add EL9 support +* Wed Feb 07 2024 Mike Riddle - 0.5.0 +- [puppetsync] Update metadata upper bounds for puppet-nsswitch, puppet-gitlab, puppet-snmp, simp-pam, and simp-useradd * Wed Oct 11 2023 Steven Pritchard - 0.4.0 - [puppetsync] Updates for Puppet 8 From 4990af2fd5b2a82f0ec379105ae462aad3535025 Mon Sep 17 00:00:00 2001 From: Steven Pritchard Date: Mon, 9 Dec 2024 09:24:07 -0600 Subject: [PATCH 3/3] Update hiera data for EL > 8 --- data/os/RedHat.yaml | 5 +---- data/os/RedHat/7.yaml | 5 +++++ data/os/RedHat/8.yaml | 2 -- 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 data/os/RedHat/7.yaml delete mode 100644 data/os/RedHat/8.yaml diff --git a/data/os/RedHat.yaml b/data/os/RedHat.yaml index 21bf711..fa185a5 100644 --- a/data/os/RedHat.yaml +++ b/data/os/RedHat.yaml @@ -1,6 +1,3 @@ --- -rkhunter::install_optional_packages: true - -rkhunter::install::optional_packages: - - unhide +rkhunter::install_optional_packages: false diff --git a/data/os/RedHat/7.yaml b/data/os/RedHat/7.yaml new file mode 100644 index 0000000..ac45af0 --- /dev/null +++ b/data/os/RedHat/7.yaml @@ -0,0 +1,5 @@ +--- +rkhunter::install_optional_packages: true + +rkhunter::install::optional_packages: + - unhide diff --git a/data/os/RedHat/8.yaml b/data/os/RedHat/8.yaml deleted file mode 100644 index a55005c..0000000 --- a/data/os/RedHat/8.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -rkhunter::install_optional_packages: false