From c0a27d5b9a5752871ab471169ac490713183fed8 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
Date: Thu, 14 Mar 2024 02:19:49 +0100
Subject: [PATCH] feat(stats): expose-fd listeners

This allows "expose-fd listeners" to be configured on stats
sockets:
https://docs.haproxy.org/2.4/configuration.html#5.1-expose-fd%20listeners

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 haproxy/templates/haproxy.jinja | 2 +-
 pillar.example                  | 1 +
 test/salt/pillar/default.sls    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/haproxy/templates/haproxy.jinja b/haproxy/templates/haproxy.jinja
index 9ad1544..e4a9bcf 100644
--- a/haproxy/templates/haproxy.jinja
+++ b/haproxy/templates/haproxy.jinja
@@ -46,7 +46,7 @@ global
     daemon
 {%- endif %}
 {%- for socket, socket_config in salt['pillar.get']('haproxy:global:stats', {}).items() %}
-    stats socket {{ socket }} mode {{ socket_config.get('mode', '0600') }} level {{ socket_config.get('level', 'user') }} user {{ socket_config.get('user', 'haproxy') }} group {{ socket_config.get('group', 'haproxy') }}
+    stats socket {{ socket }} mode {{ socket_config.get('mode', '0600') }} level {{ socket_config.get('level', 'user') }} user {{ socket_config.get('user', 'haproxy') }} group {{ socket_config.get('group', 'haproxy') }}{{ ' expose-fd listeners' if socket_config.get('expose-fd listeners', False) else '' }}
 {%- endfor %}
 {%- if 'maxconn' in salt['pillar.get']('haproxy:global', {}) %}
     maxconn {{ salt['pillar.get']('haproxy:global:maxconn') }}
diff --git a/pillar.example b/pillar.example
index 3a05a85..0de7ed6 100644
--- a/pillar.example
+++ b/pillar.example
@@ -37,6 +37,7 @@ haproxy:
         level: admin
         mode: 660
         group: sysadmins
+        expose-fd listeners: true
     # yamllint disable-line rule:line-length
     ssl-default-bind-ciphers: "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA384"
     ssl-default-bind-options: "no-sslv3 no-tlsv10 no-tlsv11"
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
index 2bd03ac..d417cd7 100644
--- a/test/salt/pillar/default.sls
+++ b/test/salt/pillar/default.sls
@@ -25,6 +25,7 @@ haproxy:
         level: operator
         mode: 660
         group: users
+        expose-fd listeners: true
       /run/haproxy/stats-admin:
         level: admin
         mode: 600