recommit for updates in build 48

doc/puppet_classes/cd_nagios_3A_3Afirewall_3A_3Aiptables.html

@@ -138,19 +138,7 @@ href="http://www.gnu.org/licenses">www.gnu.org/licenses</a>/.</p>
 42
 43
 44
-45
+45</pre>
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 24</span>
@@ -163,27 +151,15 @@ class cd_nagios::firewall::iptables (
 
     if $ng_use_https != true {
 
-      firewall { &quot;${ng_fw_order}${ng_http_port} port ${ng_http_port}&quot;:
+      include confdroid_infrastructure::firewall::http
-        proto   =&gt; [&#39;tcp&#39;,&#39;udp&#39;],
-        dport   =&gt; $ng_http_port,
-        action  =&gt; &#39;accept&#39;,
-      }
-    }
 
     if $ng_use_https == true {
 
-      firewall { &quot;${ng_fw_order}${ng_https_port} port ${ng_https_port}&quot;:
+      include confdroid_infrastructure::firewall::https
-        proto   =&gt; [&#39;tcp&#39;,&#39;udp&#39;],
-        dport   =&gt; $ng_https_port,
-        action  =&gt; &#39;accept&#39;,
-      }
 
       if $ng_http_https_fw == true {
 
-        firewall { &quot;${ng_fw_order}${ng_http_port} port ${ng_http_port}&quot;:
+        include confdroid_infrastructure::firewall::http
-          proto   =&gt; [&#39;tcp&#39;,&#39;udp&#39;],
-          dport   =&gt; $ng_http_port,
-          action  =&gt; &#39;accept&#39;,
         }
       }
     }