Recommit for updates in build 2

README.md

@@ -1,7 +1,7 @@
 # Readme
 
 [![Build Status](https://jenkins.confdroid.com/buildStatus/icon?job=confdroid_firewall&style=plastic)](https://jenkins.confdroid.com/job/confdroid_firewall/)
-
+[![Security Hotspots](https://sonarqube.confdroid.com/api/project_badges/measure?project=confdroid_firewall&metric=security_hotspots&token=sqb_496a81156409d128d9f664bdf76c4121eb26deaa)](https://sonarqube.confdroid.com/dashboard?id=confdroid_firewall)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/grizzlycoda/puppet_collection)
 
 - [Readme](#readme)

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>
       

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://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>
-
-<p><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>

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://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>
-
-<p><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>

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>

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>

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>

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,7 +97,49 @@
 
 
 <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>
+
 
 
 </div><div class="method_details_list">
@@ -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

manifests/main/config.pp

@@ -6,4 +6,5 @@
 class confdroid_firewall::main::config (
 
 ) inherits confdroid_firewall::params {
+  include confdroid_firewall::main::install
 }

manifests/main/install.pp

@@ -0,0 +1,12 @@
+#### confdroid_firewall::main::install.pp
+# Module name: confdroid_firewall
+# Author: 12ww1160 (12ww1160@confdroid.com)
+# @summary Class manages installation logic for the confdroid_firewall module
+###############################################################################
+class confdroid_firewall::main::install (
+
+) inherits confdroid_firewall::params {
+  package { $fw_req_packages:
+    ensure => $fw_pkg_ensure,
+  }
+}

manifests/params.pp

@@ -1,10 +1,16 @@
 ## confdroid_firewall::params.pp
 # Module name: confdroid_firewall
 # Author: 12ww1160 (12ww1160@confdroid.com)
+# @param [Array] fw_req_packages - List of required packages
+# @param [String] fw_pkg_ensure - Ensure state of required packages
 # @summary Class contains all parameters for the confdroid_firewall module.
 ##############################################################################
 class confdroid_firewall::params (
 
+  # Installation
+  Array $fw_req_packages  = ['nftables','iptables-nft'],
+  String $fw_pkg_ensure   = 'present',
+
 ) {
 # includes must be last in the class to avoid circular dependencies
   include confdroid_firewall::main::config