From c5e266a5f1239423fb6c44d64c34759dddeff1a2 Mon Sep 17 00:00:00 2001
From: Arne Teuke <arne_teuke@confdroid.com>
Date: Thu, 5 Jun 2025 17:24:09 +0200
Subject: [PATCH 1/4] add new MR approach

---
 Jenkinsfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d27f33a..6f7af1a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -91,7 +91,12 @@ pipeline {
                 git config user.name "Jenkins Server"
                 git config user.email jenkins@confdroid.com
                 git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push origin HEAD:master
+                git push -o merge_request.create \
+                         -o merge_request.target=master \
+                         -o merge_request.title="Auto-merge for build $BUILD_NUMBER" \
+                         -o merge_request.description="Automated changes from Jenkins build $BUILD_NUMBER" \
+                         -o merge_request.merge_when_pipeline_succeeds=true \
+                         origin jenkins-build-$BUILD_NUMBER
             '''
         }
       }

From e2c6237d7eab72feb6e4a756668d6056e5c17f7d Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Wed, 11 Mar 2026 14:43:06 +0100
Subject: [PATCH 2/4] change requirement

---
 manifests/monitoring/fail2ban.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/monitoring/fail2ban.pp b/manifests/monitoring/fail2ban.pp
index 6a9df6f..7c311eb 100644
--- a/manifests/monitoring/fail2ban.pp
+++ b/manifests/monitoring/fail2ban.pp
@@ -6,7 +6,7 @@ class haproxy_cd::monitoring::fail2ban (
 
 ) inherits haproxy_cd::params {
   if $hy_manage_fail2ban == true {
-    require fail2ban_cd # (external module)
+    require confdroid_fail2ban # (external module)
 
     # configure filter
 

From dbf6b81a089e273fe5a08211c20276da3b48fee2 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Wed, 11 Mar 2026 14:48:29 +0100
Subject: [PATCH 3/4] change requirement

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a7780a9..c283393 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 ## WARNING
 
-***Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production***
+>**Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production**
 
 ## Features
 

From a0b661a443744adad6079f76626015836ba3c5d4 Mon Sep 17 00:00:00 2001
From: Jenkins Server <jenkins@confdroid.com>
Date: Wed, 11 Mar 2026 14:49:57 +0100
Subject: [PATCH 4/4] Recommit for updates in build 15

---
 doc/file.README.html                                          | 4 +++-
 doc/index.html                                                | 4 +++-
 .../haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/file.README.html b/doc/file.README.html
index 3fc82e5..cb7fc9c 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -72,7 +72,9 @@
 
 <h2 id="label-WARNING">WARNING</h2>
 
-<p><strong><em>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</em></strong></p>
+<blockquote>
+<p><strong>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</strong></p>
+</blockquote>
 
 <h2 id="label-Features">Features</h2>
 
diff --git a/doc/index.html b/doc/index.html
index a92e485..6047acb 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -72,7 +72,9 @@
 
 <h2 id="label-WARNING">WARNING</h2>
 
-<p><strong><em>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</em></strong></p>
+<blockquote>
+<p><strong>Attention: Never use this puppet module on systems which have been previously configured manually. It is impossible to predict how and what would have been configured, hence previous configurations outside the scope of this module may be overwritten! Automated configurations require a test environment to verify that the module suits the purpose intended by the user, as well as tune the parameters, before deploying into live production</strong></p>
+</blockquote>
 
 <h2 id="label-Features">Features</h2>
 
diff --git a/doc/puppet_classes/haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html b/doc/puppet_classes/haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html
index 87097a6..4deb8ea 100644
--- a/doc/puppet_classes/haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html
+++ b/doc/puppet_classes/haproxy_cd_3A_3Amonitoring_3A_3Afail2ban.html
@@ -144,7 +144,7 @@ class haproxy_cd::monitoring::fail2ban (
 
 ) inherits haproxy_cd::params {
   if $hy_manage_fail2ban == true {
-    require fail2ban_cd # (external module)
+    require confdroid_fail2ban # (external module)
 
     # configure filter