Recommit for updates in build 4

doc/puppet_classes/confdroid_haproxy_3A_3Afirewall_3A_3Aiptables.html

@@ -117,15 +117,7 @@
 19
 20
 21
-22
-23
-24
-25
-26
-27
-28
-29
-30</pre>
+22</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/firewall/iptables.pp', line 6</span>
@@ -145,14 +137,6 @@ class confdroid_haproxy::firewall::iptables (
       dport =&gt; $hy_https_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>
       </td>

doc/puppet_classes/confdroid_haproxy_3A_3Aparams.html

@@ -879,24 +879,6 @@
         —
         <div class='inline'>
 <p>whether to allow stats in selinux</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>hy_stats_port</span>
-      
-      
-        <span class='type'>(<tt>String</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>&#39;8404&#39;</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>the port to use for stats. used in firewall settings</p>
 </div>
       
     </li>
@@ -912,6 +894,7 @@
         <pre class="lines">
 
 
+59
 60
 61
 62
@@ -1002,12 +985,10 @@
 147
 148
 149
-150
-151
-152</pre>
+150</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 60</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 59</span>
 
 class confdroid_haproxy::params (
 
@@ -1029,7 +1010,6 @@ class confdroid_haproxy::params (
 # main config
   String $hy_http_port                = &#39;80&#39;,
   String $hy_https_port               = &#39;443&#39;,
-  String $hy_stats_port               = &#39;8404&#39;,
   String $hy_chroot                   = &#39;/var/lib/haproxy&#39;,
   String $hy_pid                      = &#39;/var/run/haproxy.pid&#39;,
   String $hy_maxconn                  = &#39;4000&#39;,

manifests/firewall/iptables.pp

@@ -18,13 +18,5 @@ class confdroid_haproxy::firewall::iptables (
       dport => $hy_https_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

@@ -55,7 +55,6 @@
 # @param [String] hy_be_userlist backend userlist comment
 # @param [Boolean] hy_manage_be_users  whether to manage backend users
 # @param [Boolean] hy_selinux_allow_stats whether to allow stats in selinux
-# @param [String] hy_stats_port the port to use for stats. used in firewall settings
 ###############################################################################
 class confdroid_haproxy::params (
 
@@ -77,7 +76,6 @@ class confdroid_haproxy::params (
 # main config
   String $hy_http_port                = '80',
   String $hy_https_port               = '443',
-  String $hy_stats_port               = '8404',
   String $hy_chroot                   = '/var/lib/haproxy',
   String $hy_pid                      = '/var/run/haproxy.pid',
   String $hy_maxconn                  = '4000',

templates/haproxy_head.erb

@@ -61,6 +61,7 @@ listen stats
     stats refresh 30s
     stats admin if TRUE  # Allow admin actions if logged in
 <% end -%>
+listen stats
 
 <% if @hy_manage_be_users == true -%>
   <%= @hy_be_userlist %>