ccchb
/
ansible
6
1
Fork 1
Code Issues 3 Pull Requests Releases Wiki Activity

Use path variables for HAProxy. Changes #31

This commit is contained in:
Crest 2022-07-04 02:46:09 +02:00
parent b9d4e0b0d0
commit 6f18f4a005
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roles/haproxy/handlers/main.yml
View File

@ -5,13 +5,13 @@
state: reloaded state: reloaded
- name: Restart HAProxy - 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 - 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 - name: Reload HAProxy
command: s6-svc -2 /run/service/haproxy command: s6-svc -2 {{ s6_scan_dir }}/haproxy
- name: Restart acme-renew - 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

6
roles/haproxy/tasks/main.yml
View File

@ -200,7 +200,7 @@
meta: flush_handlers meta: flush_handlers
- name: Start HAProxy - 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 register: change
changed_when: change.stdout | length > 0 changed_when: change.stdout | length > 0
@ -243,7 +243,7 @@
path: /var/db/acme/account.conf path: /var/db/acme/account.conf
regex: '^DEPLOY_HAPROXY_RELOAD=' regex: '^DEPLOY_HAPROXY_RELOAD='
state: present 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 - name: Allow acme user to reload haproxy
template: template:
@ -309,7 +309,7 @@
meta: flush_handlers meta: flush_handlers
- name: Start acme renew service - 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 register: change
changed_when: change.stdout | length > 0 changed_when: change.stdout | length > 0

2
roles/haproxy/templates/acme.j2
View File

@ -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