From 8f6a96587106a6c5eaa9d923be8f85e710c82992 Mon Sep 17 00:00:00 2001
From: Alfredo Moralejo <amoralej@redhat.com>
Date: Tue, 1 Jun 2021 18:49:57 +0200
Subject: [PATCH] Install rsync-daemon in CentOS >= 8 when not using xinetd

Since CentOS 8, rsyncd systemd unit is shipped in a different package,
rsync-dameon. When setting use_xinetd to false in rsync::server, this
package should be installed for CentOS >= 8.
---
 .travis.yml                 | 2 +-
 manifests/server.pp         | 9 +++++++++
 metadata.json               | 5 +++--
 spec/classes/server_spec.rb | 3 +++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 68d3e96..e381477 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ jobs:
       stage: deploy
 branches:
   only:
-    - master
+    - main
     - /^v\d/
 notifications:
   email: false
diff --git a/manifests/server.pp b/manifests/server.pp
index b76a8c7..4c155ff 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -50,6 +50,15 @@
       require     => Package['rsync'],
     }
   } else {
+    if ($facts['os']['family'] == 'RedHat') and
+        (Integer($facts['os']['release']['major']) >= 8) and
+        ($rsync::manage_package) {
+      package { 'rsync-daemon':
+        ensure => $rsync::package_ensure,
+        notify => Service[$servicename],
+      }
+    }
+
     service { $servicename:
       ensure     => running,
       enable     => true,
diff --git a/metadata.json b/metadata.json
index 8d1d581..1703f6d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">=4.2.0 <7.0.0"
+      "version_requirement": ">=4.2.0 <9.0.0"
     },
     {
       "name": "puppetlabs/xinetd",
@@ -26,7 +26,8 @@
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6.0",
-        "7.0"
+        "7.0",
+        "8.0"
       ]
     },
     {
diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
index 020d29e..837b038 100644
--- a/spec/classes/server_spec.rb
+++ b/spec/classes/server_spec.rb
@@ -35,6 +35,9 @@
                         'rsync'
                       end
         it { is_expected.to contain_service(servicename) }
+        if facts[:os][:family] == 'RedHat' && Integer(facts[:os][:release][:major]) >= 8
+          it { is_expected.to contain_package('rsync-daemon') }
+        end
       end
 
       describe 'when setting an motd' do