diff --git a/CHANGELOG b/CHANGELOG index 298d0fd..6c4a167 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,9 @@ +* Tue Sep 26 2023 Steven Pritchard - 6.7.0 +- Add AlmaLinux 8 support +- Update module dependencies +- Add Puppet 8 support +- Drop Puppet 6 support + * Mon Aug 21 2023 Rick Gardner - 6.6.1 - Add Rhel 9 Hiera data diff --git a/data/os/AlmaLinux-8.yaml b/data/os/AlmaLinux-8.yaml new file mode 100644 index 0000000..995bd97 --- /dev/null +++ b/data/os/AlmaLinux-8.yaml @@ -0,0 +1,2 @@ +--- +rsync::server::package: rsync-daemon diff --git a/manifests/selinux.pp b/manifests/selinux.pp index cde6487..2890c5d 100644 --- a/manifests/selinux.pp +++ b/manifests/selinux.pp @@ -3,28 +3,25 @@ # @author https://github.com/simp/pupmod-simp-selinux/graphs/contributors # class rsync::selinux { + $_sebool_anon_write = $rsync::sebool_anon_write ? { true => 'on', default => 'off' } + $_sebool_client = $rsync::sebool_client ? { true => 'on', default => 'off' } + $_sebool_export_all_ro = $rsync::sebool_export_all_ro ? { true => 'on', default => 'off' } + $_sebool_full_access = $rsync::sebool_full_access ? { true => 'on', default => 'off' } - $_sebool_anon_write = $::rsync::sebool_anon_write ? { true => 'on', default => 'off' } - $_sebool_client = $::rsync::sebool_client ? { true => 'on', default => 'off' } - $_sebool_export_all_ro = $::rsync::sebool_export_all_ro ? { true => 'on', default => 'off' } - $_sebool_full_access = $::rsync::sebool_full_access ? { true => 'on', default => 'off' } - - if $facts[os][name] in ['RedHat','CentOS','OracleLinux','Amazon','Rocky'] { - selboolean { 'rsync_client': - persistent => true, - value => $_sebool_client - } - selboolean { 'rsync_export_all_ro': - persistent => true, - value => $_sebool_export_all_ro - } - selboolean { 'rsync_anon_write': - persistent => true, - value => $_sebool_anon_write - } - selboolean { 'rsync_full_access': - persistent => true, - value => $_sebool_full_access - } + selboolean { 'rsync_client': + persistent => true, + value => $_sebool_client + } + selboolean { 'rsync_export_all_ro': + persistent => true, + value => $_sebool_export_all_ro + } + selboolean { 'rsync_anon_write': + persistent => true, + value => $_sebool_anon_write + } + selboolean { 'rsync_full_access': + persistent => true, + value => $_sebool_full_access } } diff --git a/metadata.json b/metadata.json index 321dbc1..71805a5 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-rsync", - "version": "6.6.1", + "version": "6.7.0", "author": "SIMP Team", "summary": "manage an rsync server, secured by stunnel", "license": "Apache-2.0", @@ -15,11 +15,11 @@ "dependencies": [ { "name": "puppetlabs/concat", - "version_requirement": ">= 6.4.0 < 8.0.0" + "version_requirement": ">= 6.4.0 < 10.0.0" }, { "name": "puppetlabs/stdlib", - "version_requirement": ">= 8.0.0 < 9.0.0" + "version_requirement": ">= 8.0.0 < 10.0.0" }, { "name": "simp/rsyslog", @@ -71,12 +71,18 @@ "operatingsystemrelease": [ "8" ] + }, + { + "operatingsystem": "AlmaLinux", + "operatingsystemrelease": [ + "8" + ] } ], "requirements": [ { "name": "puppet", - "version_requirement": ">= 6.22.1 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ] }