Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add AlmaLinux 8 support #102

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
* Tue Sep 26 2023 Steven Pritchard <[email protected]> - 6.7.0
- Add AlmaLinux 8 support
- Update module dependencies
- Add Puppet 8 support
- Drop Puppet 6 support

* Mon Aug 21 2023 Rick Gardner <[email protected]> - 6.6.1
- Add Rhel 9 Hiera data

Expand Down
2 changes: 2 additions & 0 deletions data/os/AlmaLinux-8.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
rsync::server::package: rsync-daemon
41 changes: 19 additions & 22 deletions manifests/selinux.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
14 changes: 10 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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"
}
]
}