Recommit for updates in build 20

doc/file.README.html

@@ -162,7 +162,7 @@
 <p>through Foreman:</p>
 </li></ul>
 
-<p>In order to apply parameters through Foreman, <strong>confdroid_nrpe::params</strong> must be added to the host or host group in question, unless the defaults are fully acceptable across the estate.</p>
+<p>In order to apply parameters through Foreman, *<strong><em>confdroid_nrpe::params</em></strong>- must be added to the host or host group in question, unless the defaults are fully acceptable across the estate.</p>
 
 <p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on Confdroid.com</a>.</p>
 
@@ -212,6 +212,8 @@
 <p>excluded tests:</p>
 <ul><li>
 <p><code>--no-variable_scope-check</code>: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters.</p>
+</li><li>
+<p><code>--no-top_scope_facts</code>: iptables does not recognise otherwise</p>
 </li></ul>
 </li><li>
 <p>Puppet Parser</p>

doc/index.html

@@ -162,7 +162,7 @@
 <p>through Foreman:</p>
 </li></ul>
 
-<p>In order to apply parameters through Foreman, <strong>confdroid_nrpe::params</strong> must be added to the host or host group in question, unless the defaults are fully acceptable across the estate.</p>
+<p>In order to apply parameters through Foreman, *<strong><em>confdroid_nrpe::params</em></strong>- must be added to the host or host group in question, unless the defaults are fully acceptable across the estate.</p>
 
 <p>See <a href="https://confdroid.com/2017/05/deploying-our-puppet-modules/">more details about class deployment on Confdroid.com</a>.</p>
 
@@ -212,6 +212,8 @@
 <p>excluded tests:</p>
 <ul><li>
 <p><code>--no-variable_scope-check</code>: not applicable as we are inheriting parameters from params class. the lint check does not distinguish between facts and inherited parameters.</p>
+</li><li>
+<p><code>--no-top_scope_facts</code>: iptables does not recognise otherwise</p>
 </li></ul>
 </li><li>
 <p>Puppet Parser</p>

doc/puppet_classes/confdroid_nrpe_3A_3Afirewall_3A_3Aiptables.html

@@ -110,8 +110,7 @@
 15
 16
 17
-18
-19</pre>
+18</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 7</span>
@@ -119,10 +118,9 @@
 class confdroid_nrpe::firewall::iptables (
 
 ) inherits confdroid_nrpe::params {
-
   if $ne_incl_fw == true {
     firewall { &quot;${ne_fw_order_no}${ne_nrpe_port} port ${ne_nrpe_port}&quot;:
-      source =&gt; $nagios_server,
+      source =&gt; $nagios_source,
       proto  =&gt; &#39;tcp&#39;,
       dport  =&gt; $ne_nrpe_port,
       jump   =&gt; &#39;accept&#39;,