From 66b62c56294d7ccc47491e289bdc07f7480a77e6 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 26 May 2020 14:42:35 +0200
Subject: [PATCH] haproxy: chroot and socket path are configurable

---
 CHANGELOG.md                             | 1 +
 haproxy/defaults/main.yml                | 3 +++
 haproxy/templates/haproxy.default.cfg.j2 | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eee08070..a5c6151c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The **patch** part changes incrementally at each release.
 ### Changed
 
 * packweb-apache: Don't turn on mod-evasive emails by default
+* haproxy: chroot and socket path are configurable
 
 ### Fixed
 
diff --git a/haproxy/defaults/main.yml b/haproxy/defaults/main.yml
index cfe3fcea..a0f4f259 100644
--- a/haproxy/defaults/main.yml
+++ b/haproxy/defaults/main.yml
@@ -4,3 +4,6 @@ haproxy_backports: "{{ haproxy_jessie_backports | default(false, true) }}"
 haproxy_stats_url: "http://127.0.0.1:8080/"
 haproxy_update_config: True
 haproxy_force_config: True
+
+haproxy_socket: /run/haproxy/admin.sock
+haproxy_chroot: /var/lib/haproxy
diff --git a/haproxy/templates/haproxy.default.cfg.j2 b/haproxy/templates/haproxy.default.cfg.j2
index 5e060629..583cb347 100644
--- a/haproxy/templates/haproxy.default.cfg.j2
+++ b/haproxy/templates/haproxy.default.cfg.j2
@@ -3,8 +3,8 @@
 global
     log /dev/log    local0
     log /dev/log    local1 notice
-    chroot /var/lib/haproxy
-    stats socket /run/haproxy/admin.sock mode 660 level admin
+    chroot {{ haproxy_chroot }}
+    stats socket {{ haproxy_socket }} mode 660 level admin
     stats timeout 30s
     user haproxy
     group haproxy