From ab51698d011ec59c2b871216acdab22b869d8ba1 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Fri, 15 Dec 2023 13:31:59 +0100
Subject: [PATCH 1/2] modulesync 7.2.0

---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/release.yml | 2 +-
 .msync.yml                    | 2 +-
 .pmtignore                    | 1 +
 Gemfile                       | 8 +++-----
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a077911..b66d8ca7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,6 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'false'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15f17213..55324aa6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   release:
     name: Release
-    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
     with:
       allowed_owner: 'voxpupuli'
     secrets:
diff --git a/.msync.yml b/.msync.yml
index dd3e9572..f8183449 100644
--- a/.msync.yml
+++ b/.msync.yml
@@ -2,4 +2,4 @@
 # Managed by modulesync - DO NOT EDIT
 # https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-modulesync_config_version: '7.0.0'
+modulesync_config_version: '7.2.0'
diff --git a/.pmtignore b/.pmtignore
index 58a04088..10b98306 100644
--- a/.pmtignore
+++ b/.pmtignore
@@ -35,3 +35,4 @@
 /.yardoc/
 /.yardopts
 /Dockerfile
+/HISTORY.md
diff --git a/Gemfile b/Gemfile
index db21d3b5..a4a3b204 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ group :test do
   gem 'voxpupuli-test', '~> 7.0',   :require => false
   gem 'coveralls',                  :require => false
   gem 'simplecov-console',          :require => false
-  gem 'puppet_metadata', '~> 3.0',  :require => false
+  gem 'puppet_metadata', '~> 3.5',  :require => false
 end
 
 group :development do
@@ -16,13 +16,11 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'voxpupuli-acceptance', '~> 3.0',  :require => false
 end
 
 group :release do
-  gem 'github_changelog_generator', '>= 1.16.1',  :require => false
-  gem 'voxpupuli-release', '~> 3.0',              :require => false
-  gem 'faraday-retry', '~> 2.1',                  :require => false
+  gem 'voxpupuli-release', '~> 3.0',  :require => false
 end
 
 gem 'rake', :require => false

From 166263b2c85edcd309eb2081f97146c1b1f74fc3 Mon Sep 17 00:00:00 2001
From: markuszilch <zilchmarkus@web.de>
Date: Tue, 30 Jan 2024 22:26:49 +0100
Subject: [PATCH 2/2] refactor default spec test

---
 spec/defines/generate_concat_spec.rb | 30 ++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/spec/defines/generate_concat_spec.rb b/spec/defines/generate_concat_spec.rb
index 4d0abe30..02ff9e9e 100644
--- a/spec/defines/generate_concat_spec.rb
+++ b/spec/defines/generate_concat_spec.rb
@@ -3,17 +3,27 @@
 require 'spec_helper'
 
 describe 'Rsyslog::Generate_concat', include_rsyslog: true do
-  let(:pre_condition) { 'include rsyslog' }
-  let(:title) { 'mygeneratedconcat' }
+  context 'default' do
+    let(:pre_condition) { 'include rsyslog' }
+    let(:title) { 'mygeneratedconcat' }
 
-  let(:params) do
-    {
-      confdir: '/etc/rsyslog.d',
-      target: '50-rsyslog.conf'
-    }
-  end
+    on_supported_os.each do |os, os_facts|
+      context "on #{os}" do
+        let :facts do
+          os_facts
+        end
+
+        let(:params) do
+          {
+            confdir: '/etc/rsyslog.d',
+            target: '50-rsyslog.conf'
+          }
+        end
 
-  context 'with defaults' do
-    it { is_expected.to contain_concat('/etc/rsyslog.d/50-rsyslog.conf').that_notifies('Service[rsyslog]') }
+        it 'contains rsyslog config with syslog service notification' do
+          is_expected.to contain_concat('/etc/rsyslog.d/50-rsyslog.conf').that_notifies('Service[rsyslog]')
+        end
+      end
+    end
   end
 end