Merge remote-tracking branch 'origin/master' into jenkins-build-6

.vscode/settings.json

@@ -1,16 +0,0 @@
-{
-    "cSpell.words": [
-        "dontlognull",
-        "dport",
-        "forwardfor",
-        "httplog",
-        "maxconn",
-        "nologin",
-        "pidfile",
-        "redispatch",
-        "sess",
-        "setsebool",
-        "tcplog",
-        "userlist"
-    ]
-}

Jenkinsfile

@@ -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
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}

doc/puppet_classes/confdroid_haproxy_3A_3Afirewall_3A_3Aiptables.html

@@ -117,7 +117,15 @@
 19
 20
 21
-22</pre>
+22
+23
+24
+25
+26
+27
+28
+29
+30</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -137,6 +145,14 @@ class confdroid_haproxy::firewall::iptables (
       dport =&gt; $hy_https_port,
       jump  =&gt; &#39;accept&#39;,
     }
+
+    if $hy_show_stats == true {
+      firewall { &quot;${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}&quot;:
+        proto =&gt; &#39;tcp&#39;,
+        dport =&gt; $hy_stats_port,
+        jump  =&gt; &#39;accept&#39;,
+      }
+    }
   }
 }</pre>
       </td>

doc/puppet_classes/confdroid_haproxy_3A_3Aparams.html

@@ -879,6 +879,24 @@
         —
         <div class='inline'>
 <p>whether to allow stats in selinux</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>hy_stats_port</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;8404&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>the port to use for stats. used in firewall settings</p>
 </div>
       
     </li>
@@ -894,7 +912,6 @@
         <pre class="lines">
 
 
-59
 60
 61
 62
@@ -985,10 +1002,12 @@
 147
 148
 149
-150</pre>
+150
+151
+152</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 60</span>
 
 class confdroid_haproxy::params (
 
@@ -1010,6 +1029,7 @@ class confdroid_haproxy::params (
 # main config
   String $hy_http_port                = &#39;80&#39;,
   String $hy_https_port               = &#39;443&#39;,
+  String $hy_stats_port               = &#39;8404&#39;,
   String $hy_chroot                   = &#39;/var/lib/haproxy&#39;,
   String $hy_pid                      = &#39;/var/run/haproxy.pid&#39;,
   String $hy_maxconn                  = &#39;4000&#39;,

templates/haproxy_head.erb

@@ -50,7 +50,6 @@ defaults
     timeout check           <%= @hy_timeout_check %>
     maxconn                 <%= @hy_maxconn %>
 
-<% if @hy_show_stats == true -%>
 listen stats
     bind *:8404
     mode http
@@ -60,7 +59,6 @@ listen stats
     stats auth <%= @hy_stats_auth %>
     stats refresh 30s
     stats admin if TRUE  # Allow admin actions if logged in
-<% end -%>
 
 <% if @hy_manage_be_users == true -%>
   <%= @hy_be_userlist %>