Merge remote-tracking branch 'origin/master' into jenkins-build-6

README.md

@@ -101,7 +101,7 @@ Multiple ACLs need to be added as array, and will create one line each.
 ## SELINUX
 
 All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.
-If selinux is set to `enforce` (not controlled within this module),  the parameter `hy_selinux_allow_stats` must also be set to `true`, else the haproxy service will not start  as selinux will not allow it.
+If selinux is set to `enforce` (not controlled within this module) and `hy_show_stats`is set to `true`,  the parameter `hy_selinux_allow_stats` must also be set to `true`, else the haproxy service will not start  as selinux will not allow it.
 
 ## Known Problems
 

doc/file.README.html

@@ -186,7 +186,7 @@
 
 <h2 id="label-SELINUX">SELINUX</h2>
 
-<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. If selinux is set to <code>enforce</code> (not controlled within this module), the parameter <code>hy_selinux_allow_stats</code> must also be set to <code>true</code>, else the haproxy service will not start as selinux will not allow it.</p>
+<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. If selinux is set to <code>enforce</code> (not controlled within this module) and <code>hy_show_stats</code>is set to <code>true</code>, the parameter <code>hy_selinux_allow_stats</code> must also be set to <code>true</code>, else the haproxy service will not start as selinux will not allow it.</p>
 
 <h2 id="label-Known+Problems">Known Problems</h2>
 

doc/index.html

@@ -186,7 +186,7 @@
 
 <h2 id="label-SELINUX">SELINUX</h2>
 
-<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. If selinux is set to <code>enforce</code> (not controlled within this module), the parameter <code>hy_selinux_allow_stats</code> must also be set to <code>true</code>, else the haproxy service will not start as selinux will not allow it.</p>
+<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored. If selinux is set to <code>enforce</code> (not controlled within this module) and <code>hy_show_stats</code>is set to <code>true</code>, the parameter <code>hy_selinux_allow_stats</code> must also be set to <code>true</code>, else the haproxy service will not start as selinux will not allow it.</p>
 
 <h2 id="label-Known+Problems">Known Problems</h2>
 

doc/puppet_classes/confdroid_haproxy_3A_3Afirewall_3A_3Aiptables.html

@@ -123,7 +123,9 @@
 25
 26
 27
-28</pre>
+28
+29
+30</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -144,10 +146,12 @@ class confdroid_haproxy::firewall::iptables (
       jump  =&gt; &#39;accept&#39;,
     }
 
-    firewall { &quot;${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}&quot;:
-      proto =&gt; &#39;tcp&#39;,
-      dport =&gt; $hy_stats_port,
-      jump  =&gt; &#39;accept&#39;,
+    if $hy_show_stats == true {
+      firewall { &quot;${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}&quot;:
+        proto =&gt; &#39;tcp&#39;,
+        dport =&gt; $hy_stats_port,
+        jump  =&gt; &#39;accept&#39;,
+      }
     }
   }
 }</pre>

doc/puppet_classes/confdroid_haproxy_3A_3Aparams.html

@@ -397,6 +397,24 @@
       
     </li>
   
+    <li>
+      
+        <span class='name'>hy_show_stats</span>
+      
+      
+        <span class='type'>(<tt>Boolean</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>false</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>whether we want to display the statistics page</p>
+</div>
+      
+    </li>
+  
     <li>
       
         <span class='name'>hy_stats_socket</span>
@@ -894,7 +912,6 @@
         <pre class="lines">
 
 
-59
 60
 61
 62
@@ -985,10 +1002,12 @@
 147
 148
 149
-150</pre>
+150
+151
+152</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 60</span>
 
 class confdroid_haproxy::params (
 
@@ -1014,6 +1033,7 @@ class confdroid_haproxy::params (
   String $hy_chroot                   = &#39;/var/lib/haproxy&#39;,
   String $hy_pid                      = &#39;/var/run/haproxy.pid&#39;,
   String $hy_maxconn                  = &#39;4000&#39;,
+  Boolean $hy_show_stats              = false,
   String $hy_stats_socket             = &#39;/var/lib/haproxy/stats&#39;,
   String $hy_default_mode             = &#39;tcp&#39;,
   Boolean $hy_use_http_server_close   = false,

manifests/firewall/iptables.pp

@@ -19,10 +19,12 @@ class confdroid_haproxy::firewall::iptables (
       jump  => 'accept',
     }
 
-    firewall { "${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}":
-      proto => 'tcp',
-      dport => $hy_stats_port,
-      jump  => 'accept',
+    if $hy_show_stats == true {
+      firewall { "${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}":
+        proto => 'tcp',
+        dport => $hy_stats_port,
+        jump  => 'accept',
+      }
     }
   }
 }

manifests/params.pp

@@ -23,6 +23,7 @@
 # @param [String] hy_chroot where the chroot should be
 # @param [String] hy_pid the pid file to use.
 # @param [String] hy_maxconn how many connections should we max allow.
+# @param [Boolean] hy_show_stats whether we want to display the statistics page
 # @param [String] hy_stats_socket name and path of the stats socket
 # @param [String] hy_default_mode which mode to use in the defaults block
 # @param [String] hy_log_default should be used when the instance's logging
@@ -80,6 +81,7 @@ class confdroid_haproxy::params (
   String $hy_chroot                   = '/var/lib/haproxy',
   String $hy_pid                      = '/var/run/haproxy.pid',
   String $hy_maxconn                  = '4000',
+  Boolean $hy_show_stats              = false,
   String $hy_stats_socket             = '/var/lib/haproxy/stats',
   String $hy_default_mode             = 'tcp',
   Boolean $hy_use_http_server_close   = false,