Recommit for updates in build 3

README.md

@@ -101,7 +101,6 @@ 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) 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) 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>
+<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.</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) 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>
+<p>All files and directories are configured with correct selinux context. If selinux is disabled, these contexts are ignored.</p>
 
 <h2 id="label-Known+Problems">Known Problems</h2>
 

doc/puppet_classes/confdroid_haproxy_3A_3Amain_3A_3Aconfig.html

@@ -109,13 +109,7 @@
 11
 12
 13
-14
+14</pre>
-15
-16
-17
-18
-19
-20</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/main/config.pp', line 6</span>
@@ -128,12 +122,6 @@ class confdroid_haproxy::main::config (
   if $hy_manage_fail2ban == true {
     include confdroid_haproxy::monitoring::fail2ban
   }
-
-  if $hy_selinux_allow_stats == true {
-    exec { &#39;setsebool haproxy_connect_any on&#39;:
-      path =&gt; [&#39;/bin&#39;, &#39;/usr/bin&#39;, &#39;/sbin&#39;, &#39;/usr/sbin&#39;],
-    }
-  }
 }</pre>
       </td>
     </tr>

doc/puppet_classes/confdroid_haproxy_3A_3Aparams.html

@@ -861,24 +861,6 @@
         —
         <div class='inline'>
 <p>whether to manage backend users</p>
-</div>
-      
-    </li>
-  
-    <li>
-      
-        <span class='name'>hy_selinux_allow_stats</span>
-      
-      
-        <span class='type'>(<tt>Boolean</tt>)</span>
-      
-      
-        <em class="default">(defaults to: <tt>false</tt>)</em>
-      
-      
-        &mdash;
-        <div class='inline'>
-<p>whether to allow stats in selinux</p>
 </div>
       
     </li>
@@ -894,6 +876,7 @@
         <pre class="lines">
 
 
+58
 59
 60
 61
@@ -981,14 +964,10 @@
 143
 144
 145
-146
+146</pre>
-147
-148
-149
-150</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 58</span>
 
 class confdroid_haproxy::params (
 
@@ -1004,9 +983,6 @@ class confdroid_haproxy::params (
 # fail2ban
   Boolean $hy_manage_fail2ban         = false,
 
-# selinux
-  Boolean $hy_selinux_allow_stats     = false,
-
 # main config
   String $hy_http_port                = &#39;80&#39;,
   String $hy_https_port               = &#39;443&#39;,

manifests/main/config.pp

@@ -11,10 +11,4 @@ class confdroid_haproxy::main::config (
   if $hy_manage_fail2ban == true {
     include confdroid_haproxy::monitoring::fail2ban
   }
-
-  if $hy_selinux_allow_stats == true {
-    exec { 'setsebool haproxy_connect_any on':
-      path => ['/bin', '/usr/bin', '/sbin', '/usr/sbin'],
-    }
-  }
 }

manifests/params.pp

@@ -54,7 +54,6 @@
 # @param [Boolean] hy_use_dontlognull whether to use dontlognull as default
 # @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
 ###############################################################################
 class confdroid_haproxy::params (
 
@@ -70,9 +69,6 @@ class confdroid_haproxy::params (
 # fail2ban
   Boolean $hy_manage_fail2ban         = false,
 
-# selinux
-  Boolean $hy_selinux_allow_stats     = false,
-
 # main config
   String $hy_http_port                = '80',
   String $hy_https_port               = '443',

templates/haproxy_head.erb

@@ -7,6 +7,10 @@ global
     log             <%= @hy_log_local1 %>
 <% if @hy_hard_stop == true -%>
     hard-stop-after <%= @hy_hard_stop_value %>
+<% end -%>
+<% if @hy_show_stats == true -%>
+    stats socket    /var/lib/haproxy/stats
+    stats timeout   30s
 <% end -%>
     chroot          <%= @hy_chroot %>
     pidfile         <%= @hy_pid %>
@@ -50,9 +54,8 @@ defaults
     timeout check           <%= @hy_timeout_check %>
     maxconn                 <%= @hy_maxconn %>
 
-<% if @hy_show_stats == true -%>
 listen stats
-    bind *:8404
+    bind 127.0.0.1:8404  # Bind to localhost if only local access is needed #
     mode http
     stats enable
     stats uri /haproxy?stats
@@ -60,8 +63,6 @@ listen stats
     stats auth <%= @hy_stats_auth %>
     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 %>