From 6f18f4a0051a26cd18a80c678274f208a86029c7 Mon Sep 17 00:00:00 2001
From: Crest <crest+ccchb@rlwinm.de>
Date: Mon, 4 Jul 2022 02:46:09 +0200
Subject: [PATCH] Use path variables for HAProxy. Changes #31

---
 roles/haproxy/handlers/main.yml | 8 ++++----
 roles/haproxy/tasks/main.yml    | 6 +++---
 roles/haproxy/templates/acme.j2 | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/haproxy/handlers/main.yml b/roles/haproxy/handlers/main.yml
index 5329e82..1bfc224 100644
--- a/roles/haproxy/handlers/main.yml
+++ b/roles/haproxy/handlers/main.yml
@@ -5,13 +5,13 @@
     state: reloaded
 
 - name: Restart HAProxy
-  command: s6-svc -wU -T 5000 -ru /run/service/haproxy
+  command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/haproxy
 
 - name: Restart HAProxy log
-  command: s6-svc -wU -T 5000 -ru /run/service/haproxy-log
+  command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/haproxy-log
 
 - name: Reload HAProxy
-  command: s6-svc -2 /run/service/haproxy
+  command: s6-svc -2 {{ s6_scan_dir }}/haproxy
 
 - name: Restart acme-renew
-  command: s6-svc -wU -T 5000 -ru /run/service/acme-renew
+  command: s6-svc -wU -T 5000 -ru {{ s6_scan_dir }}/acme-renew
diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml
index 1c7477d..b1f929f 100644
--- a/roles/haproxy/tasks/main.yml
+++ b/roles/haproxy/tasks/main.yml
@@ -200,7 +200,7 @@
   meta: flush_handlers
 
 - name: Start HAProxy
-  command: fdmove -c 2 1 s6-rc -u -v 2 change haproxy
+  command: fdmove -c 2 1 s6-rc -l {{ s6_live_dir }} -u -v 2 change haproxy
   register: change
   changed_when: change.stdout | length > 0
 
@@ -243,7 +243,7 @@
     path: /var/db/acme/account.conf
     regex: '^DEPLOY_HAPROXY_RELOAD='
     state: present
-    line: 'DEPLOY_HAPROXY_RELOAD="sudo s6-svc -h /run/service/haproxy"'
+    line: 'DEPLOY_HAPROXY_RELOAD="sudo s6-svc -h {{ s6_scan_dir }}/haproxy"'
 
 - name: Allow acme user to reload haproxy
   template:
@@ -309,7 +309,7 @@
   meta: flush_handlers
 
 - name: Start acme renew service
-  command: fdmove -c 2 1 s6-rc -u -v 2 change acme-renew
+  command: fdmove -c 2 1 s6-rc -l {{ s6_live_dir }} -u -v 2 change acme-renew
   register: change
   changed_when: change.stdout | length > 0
 
diff --git a/roles/haproxy/templates/acme.j2 b/roles/haproxy/templates/acme.j2
index 9c91c4a..d6031e8 100644
--- a/roles/haproxy/templates/acme.j2
+++ b/roles/haproxy/templates/acme.j2
@@ -1 +1 @@
-acme ALL=NOPASSWD:/usr/local/bin/s6-svc -h /run/service/haproxy
+acme ALL=NOPASSWD:/usr/local/bin/s6-svc -h {{ s6_scan_dir }}/haproxy