Merge pull request #11 from bastelfreak/rel120

Release 1.2.0

7 files changed, 91 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 142a9ac..c192e3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v1.2.0](https://github.com/voxpupuli/puppet-ferm/tree/v1.2.0) (2018-03-17)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v1.1.1...v1.2.0)
+
+**Implemented enhancements:**
+
+- Make usage of conntrack optional [\#9](https://github.com/voxpupuli/puppet-ferm/issues/9)
+- introduce parameter disable\_conntrack [\#10](https://github.com/voxpupuli/puppet-ferm/pull/10) ([kBite](https://github.com/kBite))
+
+**Merged pull requests:**
+
+- release 1.1.1 [\#8](https://github.com/voxpupuli/puppet-ferm/pull/8) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v1.1.1](https://github.com/voxpupuli/puppet-ferm/tree/v1.1.1) (2018-03-15)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/2d355a4c1baadc761d6b12645d0274da8866f722...v1.1.1)
diff --git a/docs/file.README.html b/docs/file.README.html
index 2392596..c0623b2 100644
--- a/docs/file.README.html
+++ b/docs/file.README.html
@@ -71,6 +71,7 @@
 
 <ul>
 <li><a href="#overview">Overview</a></li>
+<li><a href="#what-happenend-to-older-releases">What happened to older releases?</a></li>
 <li><a href="#setup">Setup</a></li>
 <li><a href="#support">Support</a></li>
 <li><a href="#reference">Reference</a></li>
@@ -86,6 +87,11 @@
 software. It allows you to configure the actual software, but also all related
 rules.</p>
 
+<h2>What happened to older releases?</h2>
+
+<p>You maybe wonder what happend to release 1.1.0 and 1.0.0. We had to take them
+down because they contained sensitive information.</p>
+
 <h2>Setup</h2>
 
 <p>This is very easy:</p>
diff --git a/docs/index.html b/docs/index.html
index 12f972f..574b0e9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -71,6 +71,7 @@
 
 <ul>
 <li><a href="#overview">Overview</a></li>
+<li><a href="#what-happenend-to-older-releases">What happened to older releases?</a></li>
 <li><a href="#setup">Setup</a></li>
 <li><a href="#support">Support</a></li>
 <li><a href="#reference">Reference</a></li>
@@ -86,6 +87,11 @@
 software. It allows you to configure the actual software, but also all related
 rules.</p>
 
+<h2>What happened to older releases?</h2>
+
+<p>You maybe wonder what happend to release 1.1.0 and 1.0.0. We had to take them
+down because they contained sensitive information.</p>
+
 <h2>Setup</h2>
 
 <p>This is very easy:</p>
diff --git a/docs/puppet_classes/ferm.html b/docs/puppet_classes/ferm.html
index 74c4b67..cbabd5c 100644
--- a/docs/puppet_classes/ferm.html
+++ b/docs/puppet_classes/ferm.html
@@ -152,6 +152,23 @@ Allowed values: Stdlib::Absolutepath</p>
   
     <li>
       
+        <span class='name'>disable_conntrack</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>disable/enable the generation of conntrack rules
+Default value: false
+Allowed values: (true|false)</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
         <span class='name'>forward_policy</span>
       
       
@@ -228,9 +245,6 @@ Allowed value: Any Hash</p>
         <pre class="lines">
 
 
-31
-32
-33
 34
 35
 36
@@ -252,15 +266,20 @@ Allowed value: Any Hash</p>
 52
 53
 54
-55</pre>
+55
+56
+57
+58
+59</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/init.pp', line 31</span>
+        <pre class="code"><span class="info file"># File 'manifests/init.pp', line 34</span>
 
 class ferm (
   Boolean $manage_service,
   Boolean $manage_configfile,
   Stdlib::Absolutepath $configfile,
+  Boolean $disable_conntrack,
   Ferm::Policies $forward_policy,
   Ferm::Policies $output_policy,
   Ferm::Policies $input_policy,
diff --git a/docs/puppet_classes/ferm_3A_3Aconfig.html b/docs/puppet_classes/ferm_3A_3Aconfig.html
index 3d9813e..139230c 100644
--- a/docs/puppet_classes/ferm_3A_3Aconfig.html
+++ b/docs/puppet_classes/ferm_3A_3Aconfig.html
@@ -131,7 +131,10 @@
 43
 44
 45
-46</pre>
+46
+47
+48
+49</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/config.pp', line 3</span>
@@ -171,13 +174,16 @@ class ferm::config {
   }
 
   ferm::chain{&#39;INPUT&#39;:
-    policy =&gt; $ferm::input_policy,
+    policy            =&gt; $ferm::input_policy,
+    disable_conntrack =&gt; $ferm::disable_conntrack,
   }
   ferm::chain{&#39;FORWARD&#39;:
-    policy =&gt; $ferm::forward_policy,
+    policy            =&gt; $ferm::forward_policy,
+    disable_conntrack =&gt; $ferm::disable_conntrack,
   }
   ferm::chain{&#39;OUTPUT&#39;:
-    policy =&gt; $ferm::output_policy,
+    policy            =&gt; $ferm::output_policy,
+    disable_conntrack =&gt; $ferm::disable_conntrack,
   }
 }</pre>
       </td>
diff --git a/docs/puppet_defined_types/ferm_3A_3Achain.html b/docs/puppet_defined_types/ferm_3A_3Achain.html
index a3576c1..a001974 100644
--- a/docs/puppet_defined_types/ferm_3A_3Achain.html
+++ b/docs/puppet_defined_types/ferm_3A_3Achain.html
@@ -97,6 +97,21 @@
   
     <li>
       
+        <span class='name'>disable_conntrack</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+      
+        &mdash;
+        <div class='inline'><p>disable/enable usage of conntrack</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
         <span class='name'>chain</span>
       
       
@@ -122,7 +137,6 @@
         <pre class="lines">
 
 
-4
 5
 6
 7
@@ -138,13 +152,21 @@
 17
 18
 19
-20</pre>
+20
+21
+22
+23
+24
+25
+26
+27</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/chain.pp', line 4</span>
+        <pre class="code"><span class="info file"># File 'manifests/chain.pp', line 5</span>
 
 define ferm::chain (
   Ferm::Policies $policy,
+  Boolean $disable_conntrack,
   Ferm::Chains $chain = $name,
 ) {
 
@@ -156,7 +178,12 @@ define ferm::chain (
 
   concat::fragment{&quot;${chain}-policy&quot;:
     target  =&gt; &quot;/etc/ferm.d/chains/${chain}.conf&quot;,
-    content =&gt; epp(&quot;${module_name}/ferm_chain_header.conf.epp&quot;, {&#39;policy&#39; =&gt; $policy }),
+    content =&gt; epp(
+      &quot;${module_name}/ferm_chain_header.conf.epp&quot;, {
+        &#39;policy&#39;            =&gt; $policy,
+        &#39;disable_conntrack&#39; =&gt; $disable_conntrack,
+      }
+    ),
     order   =&gt; &#39;01&#39;,
   }
 }</pre>
diff --git a/metadata.json b/metadata.json
index d1de326..256cd7d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-ferm",
-  "version": "1.1.2-rc0",
+  "version": "1.2.0",
   "author": "Vox Pupuli",
   "summary": "deploy and manage ferm",
   "license": "AGPL-3.0",