From 3a38ab1ef0202f8ada7e7639413ef893de11add2 Mon Sep 17 00:00:00 2001
From: Seth Lyons <seth.lyons@gmail.com>
Date: Mon, 28 Jan 2019 13:59:03 -0500
Subject: [PATCH 1/2] add support for xinetd cps paramater

---
 manifests/server.pp         |  2 ++
 spec/classes/server_spec.rb | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/manifests/server.pp b/manifests/server.pp
index 999e662..36b43b1 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -14,6 +14,7 @@
   $uid        = 'nobody',
   $gid        = 'nobody',
   $modules    = {},
+  $xinetd_cps = undef,
 ) inherits rsync {
 
   case $facts['os']['family'] {
@@ -43,6 +44,7 @@
     include xinetd
     xinetd::service { 'rsync':
       bind        => $address,
+      cps         => $xinetd_cps,
       port        => '873',
       server      => '/usr/bin/rsync',
       server_args => "--daemon --config ${conf_file}",
diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
index 44d5cca..839a710 100644
--- a/spec/classes/server_spec.rb
+++ b/spec/classes/server_spec.rb
@@ -48,6 +48,16 @@
         }
       end
 
+      describe 'when setting xinetd cps' do
+        let :params do
+          { :xinetd_cps => '25 10' }
+        end
+
+        it {
+          is_expected.to contain_xinetd__service('rsync').with({ 'cps' => '25 10' })
+        }
+      end
+
       describe 'when overriding use_chroot' do
         let :params do
           { :use_chroot => 'no' }

From 89f11aa04fb04adde6826281d8443f1959602b86 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@users.noreply.github.com>
Date: Tue, 21 Mar 2023 13:52:36 +0900
Subject: [PATCH 2/2] Fix bracket removed during conflict resolution

---
 spec/classes/server_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/classes/server_spec.rb b/spec/classes/server_spec.rb
index acd4c67..3e7a66e 100644
--- a/spec/classes/server_spec.rb
+++ b/spec/classes/server_spec.rb
@@ -67,6 +67,7 @@
 
         it {
           is_expected.to contain_xinetd__service('rsync').with({ 'cps' => '25 10' })
+        }
       end
 
       describe 'when overriding use_chroot' do