From 496d524530375bf2799a2e0837f2f125ca08de00 Mon Sep 17 00:00:00 2001
From: Lennart Betz <lennart.betz@netways.de>
Date: Fri, 1 Sep 2023 11:51:53 +0200
Subject: [PATCH] fix #732 Drop Puppet 6 Support

---
 README.md            |  9 ++++-----
 manifests/globals.pp | 11 -----------
 metadata.json        |  6 +++---
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 7ea71874..60801d20 100644
--- a/README.md
+++ b/README.md
@@ -82,13 +82,12 @@ available in Icinga 2 can be enabled and configured with this module.
 
 This module supports:
 
-* [puppet] >= 4.10 < 8.0.0
+* [puppet] >= 7.0.0 < 8.0.0
 
 And depends on:
 
-* [puppetlabs/stdlib] >= 5.0.0 < 8.0.0
-    * If Puppet 6 is used a stdlib 5.1 or higher is required, see https://github.com/Icinga/puppet-icinga2/issues/505
-* [puppetlabs/concat] >= 2.1.0 < 8.0.0
+* [puppetlabs/stdlib] >= 6.6.0 < 8.0.0
+* [puppetlabs/concat] >= 6.4.0 < 8.0.0
 * [icinga/icinga] >= 1.0.0 < 3.0.0
     * needed if `manage_repos` is set to `true`
 * [puppetlabs/chocolatey]
@@ -99,7 +98,7 @@ The use of Icinga's own CA is recommended. If you still want to use the Puppet c
 
 This module has been tested on:
 
-* Debian 10, 11
+* Debian 10, 11, 12
 * Ubuntu 20.04, 22.04
 * CentOS/RHEL 7, 8, 9
 * AlmaLinux/Rocky 8, 9
diff --git a/manifests/globals.pp b/manifests/globals.pp
index 2954f47f..61ba19aa 100644
--- a/manifests/globals.pp
+++ b/manifests/globals.pp
@@ -99,16 +99,5 @@
 ) {
   assert_private()
 
-  if ( versioncmp($::facts['puppetversion'], '6' ) >= 0 and versioncmp(load_module_metadata('stdlib')['version'], '5.1.0') < 0 ) {
-    fail('You be affected by this bug: https://github.com/Icinga/puppet-icinga2/issues/505 so you should update your stdlib to version 5.1 or higher')
-  }
-
-  # Logon account on Windows
-  if $facts['os']['kernel'] == 'windows' {
-    if $logon_account and versioncmp($::facts['puppetversion'], '6.18.0') < 0 {
-      fail('Using logon_account requieres a Puppet version 6.18 or higher')
-    }
-  }
-
   $constants =  lookup('icinga2::globals::constants', Hash, 'deep', {})
 }
diff --git a/metadata.json b/metadata.json
index d0768249..82bdf6dd 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 5.0.0 < 9.0.0"
+      "version_requirement": ">= 6.6.0 < 9.0.0"
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 2.1.0 < 8.0.0"
+      "version_requirement": ">= 6.4.0 < 8.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -106,7 +106,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 6.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 8.0.0"
     }
   ],
   "pdk-version": "2.5.0",