Merge branch 'jenkins-build-20' into 'master'

Auto-merge for build 20

See merge request puppet/haproxy_cd!6

templates/haproxy_head.erb

@@ -54,24 +54,15 @@ defaults
     timeout check           <%= @hy_timeout_check %>
     maxconn                 <%= @hy_maxconn %>
 
-#listen stats
-#    bind 127.0.0.1:8404  # Bind to localhost if only local access is needed #
-#    mode http
-#    stats enable
-#    stats uri /haproxy?stats
-#    stats realm Strictly\ Private
-#    stats auth <%= @hy_stats_auth %>
-#    stats refresh 30s
-#    stats admin if TRUE  # Allow admin actions if logged in
-
-
-frontend stats
-   bind *:8404
-   option http-use-htx
-   http-request use-service prometheus-exporter if { path /metrics }
-   stats enable
-   stats uri /stats
-   stats refresh 10s
+listen stats
+    bind 127.0.0.1:8404  # Bind to localhost if only local access is needed #
+    mode http
+    stats enable
+    stats uri /haproxy?stats
+    stats realm Strictly\ Private
+    stats auth <%= @hy_stats_auth %>
+    stats refresh 30s
+    stats admin if TRUE  # Allow admin actions if logged in
 
 <% if @hy_manage_be_users == true -%>
   <%= @hy_be_userlist %>