From cb54dad12a585d42899eb309416f43ee431b635f Mon Sep 17 00:00:00 2001 From: 12ww1160 <12ww1160@confdroid.com> Date: Sat, 5 Sep 2026 13:08:12 +0200 Subject: [PATCH] OP#669 get rid of hy_show_stats as it does not make sense --- README.md | 2 +- manifests/firewall/iptables.pp | 10 ++++------ manifests/params.pp | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index e952172..e963241 100644 --- a/README.md +++ b/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) 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. +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. ## Known Problems diff --git a/manifests/firewall/iptables.pp b/manifests/firewall/iptables.pp index 2ad0553..ed0ba31 100644 --- a/manifests/firewall/iptables.pp +++ b/manifests/firewall/iptables.pp @@ -19,12 +19,10 @@ class confdroid_haproxy::firewall::iptables ( 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', - } + firewall { "${hy_fw_order_no}${hy_stats_port} tcp port ${hy_stats_port}": + proto => 'tcp', + dport => $hy_stats_port, + jump => 'accept', } } } diff --git a/manifests/params.pp b/manifests/params.pp index f77bde4..5d6117a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -23,7 +23,6 @@ # @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 @@ -81,7 +80,6 @@ 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,