diff --git a/defaults/main.yml b/defaults/main.yml index 430c862..c94b0c1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -46,6 +46,7 @@ haproxy_acmesh: [] # must_present: /etc/haproxy/certs/ykn.fr.pem # must_absent: /etc/haproxy/haproxy.cfg # env: - # DEPLOY_HAPROXY_HOT_UPDATE: "yes" - # DEPLOY_HAPROXY_STATS_SOCKET: /var/run/haproxy/admin.sock + # # Seamless reload (master-worker), saved by acme.sh for renewals + # DEPLOY_HAPROXY_HOT_UPDATE: "no" + # DEPLOY_HAPROXY_RELOAD: systemctl reload haproxy.service # DEPLOY_HAPROXY_PEM_PATH: "{{ haproxy_certs_path }}" diff --git a/tasks/acmesh.yml b/tasks/acmesh.yml index 4b99375..b5ccc44 100644 --- a/tasks/acmesh.yml +++ b/tasks/acmesh.yml @@ -1,24 +1,9 @@ --- # tasks file for haproxy -# socat is required by the acme.sh haproxy deploy hook to hot update -# certificates through the stats socket (DEPLOY_HAPROXY_HOT_UPDATE) - name: Install acme.sh ansible.builtin.apt: - name: - - acme.sh - - socat - become: true - -# acme.sh 3.1.1 (Debian 13 package) sends "set ssl cert" with `echo -e`, -# which dash (/bin/sh) does not support: haproxy receives "-e set ssl cert" -# and the hot update fails. Apply the upstream fix (printf '%b\n'). -# No-op once the packaged hook is fixed. -- name: Fix acme.sh haproxy deploy hook hot update under dash - ansible.builtin.replace: - path: /usr/share/acme.sh/deploy/haproxy.sh - regexp: 'echo -e ''(\$\{_cmdpfx\}set ssl cert )' - replace: 'printf ''%b\\n'' ''\1' + name: acme.sh become: true # Always run: also covers instances where acme.sh is already installed