From 9dab99e781fb24e56775d2afc0068601ce90d3f7 Mon Sep 17 00:00:00 2001
From: Jenkins Server <jenkins@confdroid.com>
Date: Sat, 5 Sep 2026 14:43:48 +0200
Subject: [PATCH] Recommit for updates in build 10

---
 .vscode/settings.json |  19 -------
 Jenkinsfile           | 127 ------------------------------------------
 doc/file.README.html  |   4 ++
 doc/index.html        |   4 ++
 4 files changed, 8 insertions(+), 146 deletions(-)
 delete mode 100644 .vscode/settings.json
 delete mode 100644 Jenkinsfile

diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 1e87f6f..0000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "cSpell.words": [
-        "allowdupe",
-        "dontlognull",
-        "dport",
-        "forwardfor",
-        "httplog",
-        "managehome",
-        "maxconn",
-        "nologin",
-        "pidfile",
-        "redispatch",
-        "roundrobin",
-        "sess",
-        "setsebool",
-        "tcplog",
-        "userlist"
-    ]
-}
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 512e8e6..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,127 +0,0 @@
-pipeline {
-    agent {
-      label 'puppet'
-    }
-
-    post {
-        always {
-            deleteDir() /* clean up our workspace */
-        }
-        success {
-            updateGitlabCommitStatus state: 'success'
-        }
-        failure {
-            updateGitlabCommitStatus state: 'failed'
-            step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: 'support@confdroid.com', sendToIndividuals: true])
-        }
-    }
-
-    options {
-          gitLabConnection('gitlab.confdroid.com')
-    }
-
-    stages {
-
-      stage('pull master') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''
-                git config user.name "Jenkins Server"
-                git config user.email jenkins@confdroid.com
-                # Ensure we're on the development branch (triggered by push)
-                git checkout development
-                # Create jenkins branch from development
-                git checkout -b jenkins-build-$BUILD_NUMBER
-                # Optionally merge master into jenkins to ensure compatibility
-                git merge origin/master --no-ff || { echo "Merge conflict detected"; exit 1; }
-            '''
-        }
-      }
-    }
-
-      stage('puppet parser') {
-        steps {
-          sh '''for file in $(find . -iname \'*.pp\'); do
-            /opt/puppetlabs/bin/puppet parser validate --color false --render-as s --modulepath=modules $file || exit 1;
-            done;'''
-          }
-        }
-
-      stage('check templates') {
-        steps{
-          sh '''for file in $(find . -iname \'*.erb\');
-            do erb -P -x -T "-" $file | ruby -c || exit 1;
-            done;'''
-        }
-      }
-
-      stage('puppet-lint') {
-        steps {
-          sh '''/usr/local/bin/puppet-lint . \\
-                --no-variable_scope-check \\
-                || { echo "Puppet lint failed"; exit 1; }
-            '''
-          }
-        }
-
-      stage('SonarScan') {
-         steps {
-            withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_TOKEN')]) {
-              sh '''
-              /opt/sonar-scanner/bin/sonar-scanner \
-                -Dsonar.projectKey=confdroid_haproxy \
-                -Dsonar.sources=. \
-                -Dsonar.host.url=https://sonarqube.confdroid.com \
-                -Dsonar.token=$SONAR_TOKEN
-                '''
-              }
-            }
-          }
-
-      stage('create Puppet documentation') {
-        steps {
-          sh '/opt/puppetlabs/bin/puppet strings'
-        }
-      }
-
-      stage('update repo') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            sh '''
-                git config user.name "Jenkins Server"
-                git config user.email jenkins@confdroid.com
-                git rm -r --cached .vscode || echo "No .vscode to remove from git"
-                git add -A && git commit -am "Recommit for updates in build $BUILD_NUMBER" || echo "No changes to commit"
-                git push origin HEAD:master
-            '''
-        }
-      }
-    }
-      stage('Mirror to Gitea') {
-        steps {
-          sshagent(['edd05eb6-26b5-4c7b-a5cc-ea2ab899f4fa']) {
-            withCredentials([usernamePassword(
-              credentialsId: 'Jenkins-gitea',
-              usernameVariable: 'GITEA_USER',
-              passwordVariable: 'GITEA_TOKEN')]) {
-              script {
-                // Checkout from GitLab (already done implicitly)
-                  sh '''
-                    git checkout master
-                    git pull origin master
-                    git branch -D development
-                    git branch -D jenkins-build-$BUILD_NUMBER
-                    git rm -f Jenkinsfile
-                    git rm -r --cached .vscode || echo "No .vscode to remove from git"
-                    git commit --amend --no-edit --allow-empty
-                    git remote add master https://sourcecode.confdroid.com/confdroid/confdroid_haproxy.git
-                    git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                    push master --mirror
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/doc/file.README.html b/doc/file.README.html
index e991a83..aaa0b0f 100644
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -128,6 +128,8 @@
 </li><li>
 <p>ACL options</p>
 </li><li>
+<p>adds haproxy logs to rsyslog for remote logging where used</p>
+</li><li>
 <p>manage fail2ban integration (optional, requires <code>confdroid_fail2ban</code> module)</p>
 </li></ul>
 
@@ -136,6 +138,8 @@
 <p>manage haproxy service</p>
 </li><li>
 <p>restart service after changes in the configuration</p>
+</li><li>
+<p>stats are enabled on port 8404 with uri /haproxy?stats and strict private mode, set <code>hy_stats_auth</code> to something meaningful.</p>
 </li></ul>
 
 <h2 id="label-Dependencies">Dependencies</h2>
diff --git a/doc/index.html b/doc/index.html
index 79f4334..56b1375 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -128,6 +128,8 @@
 </li><li>
 <p>ACL options</p>
 </li><li>
+<p>adds haproxy logs to rsyslog for remote logging where used</p>
+</li><li>
 <p>manage fail2ban integration (optional, requires <code>confdroid_fail2ban</code> module)</p>
 </li></ul>
 
@@ -136,6 +138,8 @@
 <p>manage haproxy service</p>
 </li><li>
 <p>restart service after changes in the configuration</p>
+</li><li>
+<p>stats are enabled on port 8404 with uri /haproxy?stats and strict private mode, set <code>hy_stats_auth</code> to something meaningful.</p>
 </li></ul>
 
 <h2 id="label-Dependencies">Dependencies</h2>