Recommit for updates in build 2

2026-08-02 15:08:22 +02:00
parent fd88fbf74e
commit ca9d4477c2
8 changed files with 208 additions and 139 deletions
--- a/127
+++ b/127
@@ -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_firewall \
-                -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_firewall.git
-                    git -c credential.helper="!f() { echo username=${GITEA_USER}; echo password=${GITEA_TOKEN}; }; f" \
-                    push master --mirror
-                  '''
-            }
-          }
-        }
-      }
-    }
-  }
-}
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -78,6 +78,11 @@
      
            </li>
    
+            <li>
+      <span class='object_link'><a href="puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_firewall::main::install (puppet_class)">confdroid_firewall::main::install</a></span>
+      
+            </li>
+    
            <li>
      <span class='object_link'><a href="puppet_classes/confdroid_firewall_3A_3Aparams.html" title="puppet_classes::confdroid_firewall::params (puppet_class)">confdroid_firewall::params</a></span>
      
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -60,9 +60,7 @@
      <div id="content"><div id='filecontents'>
 <h1 id="label-Readme">Readme</h1>

-<p><a href="https://jenkins.confdroid.com/job/confdroid_firewall/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_firewall&amp;style=plastic"></a></p>
-
-<p><a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
+<p><a href="https://jenkins.confdroid.com/job/confdroid_firewall/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_firewall&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_firewall"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_firewall&amp;metric=security_hotspots&amp;token=sqb_496a81156409d128d9f664bdf76c4121eb26deaa"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
 <ul><li>
 <p><a href="#readme">Readme</a></p>
 </li><li>
--- a/doc/index.html
+++ b/doc/index.html
@@ -60,9 +60,7 @@
      <div id="content"><div id='filecontents'>
 <h1 id="label-Readme">Readme</h1>

-<p><a href="https://jenkins.confdroid.com/job/confdroid_firewall/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_firewall&amp;style=plastic"></a></p>
-
-<p><a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
+<p><a href="https://jenkins.confdroid.com/job/confdroid_firewall/"><img src="https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_firewall&amp;style=plastic"></a> <a href="https://sonarqube.confdroid.com/dashboard?id=confdroid_firewall"><img src="https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_firewall&amp;metric=security_hotspots&amp;token=sqb_496a81156409d128d9f664bdf76c4121eb26deaa"></a> <a href="https://deepwiki.com/grizzlycoda/puppet_collection"><img src="https://deepwiki.com/badge.svg"></a></p>
 <ul><li>
 <p><a href="#readme">Readme</a></p>
 </li><li>
--- a/doc/puppet_class_list.html
+++ b/doc/puppet_class_list.html
@@ -50,7 +50,14 @@
    </li>
    

-    <li id="object_puppet_classes::confdroid_firewall::params" class="odd">
+    <li id="object_puppet_classes::confdroid_firewall::main::install" class="odd">
+      <div class="item">
+        <span class='object_link'><a href="puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_firewall::main::install (puppet_class)">confdroid_firewall::main::install</a></span>
+      </div>
+    </li>
+    
+
+    <li id="object_puppet_classes::confdroid_firewall::params" class="even">
      <div class="item">
        <span class='object_link'><a href="puppet_classes/confdroid_firewall_3A_3Aparams.html" title="puppet_classes::confdroid_firewall::params (puppet_class)">confdroid_firewall::params</a></span>
      </div>
--- a/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html
+++ b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Aconfig.html
@@ -104,7 +104,8 @@
 6
 7
 8
-9</pre>
+9
+10</pre>
      </td>
      <td>
        <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -112,6 +113,7 @@
 class confdroid_firewall::main::config (

 ) inherits confdroid_firewall::params {
+  include confdroid_firewall::main::install
 }</pre>
      </td>
    </tr>
--- a/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_firewall_3A_3Amain_3A_3Ainstall.html
@@ -0,0 +1,134 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>
+  Puppet Class: confdroid_firewall::main::install
+  
+    &mdash; Documentation by YARD 0.9.36
+  
+</title>
+
+  <link rel="stylesheet" href="../css/style.css" type="text/css" />
+
+  <link rel="stylesheet" href="../css/common.css" type="text/css" />
+
+<script type="text/javascript">
+  pathId = "puppet_classes::confdroid_firewall::main::install";
+  relpath = '../';
+</script>
+
+
+  <script type="text/javascript" charset="utf-8" src="../js/jquery.js"></script>
+
+  <script type="text/javascript" charset="utf-8" src="../js/app.js"></script>
+
+
+  </head>
+  <body>
+    <div class="nav_wrap">
+      <iframe id="nav" src="../puppet_class_list.html?1"></iframe>
+      <div id="resizer"></div>
+    </div>
+
+    <div id="main" tabindex="-1">
+      <div id="header">
+        <div id="menu">
+  
+    <a href="../_index.html">Index (c)</a> &raquo;
+    <span class='title'><span class='object_link'>Puppet Classes</span></span>
+     &raquo; 
+    <span class="title">confdroid_firewall::main::install</span>
+  
+</div>
+
+        <div id="search">
+  
+    <a class="full_list_link" id="puppet_class_list_link"
+        href="../puppet_class_list.html">
+
+        <svg width="24" height="24">
+          <rect x="0" y="4" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="12" width="24" height="4" rx="1" ry="1"></rect>
+          <rect x="0" y="20" width="24" height="4" rx="1" ry="1"></rect>
+        </svg>
+    </a>
+  
+</div>
+        <div class="clear"></div>
+      </div>
+
+      <div id="content"><h1>Puppet Class: confdroid_firewall::main::install</h1>
+<div class="box_info">
+  
+  <dl>
+    <dt>Inherits:</dt>
+    <dd><span class='object_link'><a href="confdroid_firewall_3A_3Aparams.html" title="puppet_classes::confdroid_firewall::params (puppet_class)">confdroid_firewall::params</a></span></dd>
+  </dl>
+  
+  
+  <dl>
+    <dt>Defined in:</dt>
+    <dd>
+      manifests/main/install.pp
+    </dd>
+  </dl>
+</div>
+
+  <h2>Summary</h2>
+  Class manages installation logic for the confdroid_firewall module
+
+<h2>Overview</h2>
+<div class="docstring">
+  <div class="discussion">
+    
+<p>confdroid_firewall::main::install.pp Module name: confdroid_firewall Author: 12ww1160 (12ww1160@confdroid.com)</p>
+
+  </div>
+</div>
+
+
+
+<div class="tags">
+  
+
+
+</div><div class="method_details_list">
+  <table class="source_code">
+    <tr>
+      <td>
+        <pre class="lines">
+
+
+6
+7
+8
+9
+10
+11
+12</pre>
+      </td>
+      <td>
+        <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
+
+class confdroid_firewall::main::install (
+
+) inherits confdroid_firewall::params {
+  package { $fw_req_packages:
+    ensure =&gt; $fw_pkg_ensure,
+  }
+}</pre>
+      </td>
+    </tr>
+  </table>
+</div>
+</div>
+
+      <div id="footer">
+     Generated by <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>.
+</div>
+
+    </div>
+  </body>
+</html>
--- a/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_firewall_3A_3Aparams.html
@@ -69,6 +69,8 @@
      
      <span class='object_link'><a href="confdroid_firewall_3A_3Amain_3A_3Aconfig.html" title="puppet_classes::confdroid_firewall::main::config (puppet_class)">confdroid_firewall::main::config</a></span><br/>
      
+      <span class='object_link'><a href="confdroid_firewall_3A_3Amain_3A_3Ainstall.html" title="puppet_classes::confdroid_firewall::main::install (puppet_class)">confdroid_firewall::main::install</a></span><br/>
+      
    </dd>
  </dl>
  
@@ -95,6 +97,48 @@


 <div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+  
+    <li>
+      
+        <span class='name'>fw_req_packages</span>
+      
+      
+        <span class='type'>(<tt>Array</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[&#39;nftables&#39;,&#39;iptables-nft&#39;]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'><ul><li>
+<p>List of required packages</p>
+</li></ul>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>fw_pkg_ensure</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'><ul><li>
+<p>Ensure state of required packages</p>
+</li></ul>
+</div>
+      
+    </li>
+  
+</ul>



@@ -105,18 +149,26 @@
        <pre class="lines">


-6
-7
 8
 9
 10
-11</pre>
+11
+12
+13
+14
+15
+16
+17</pre>
      </td>
      <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 6</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 8</span>

 class confdroid_firewall::params (

+  # Installation
+  Array $fw_req_packages  = [&#39;nftables&#39;,&#39;iptables-nft&#39;],
+  String $fw_pkg_ensure   = &#39;present&#39;,
+
 ) {
 # includes must be last in the class to avoid circular dependencies
  include confdroid_firewall::main::config