From 3340e8f77957f3e7d5830b83ea640bf559fb8c06 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Mon, 16 Oct 2023 19:10:55 +0200
Subject: [PATCH] Replace letsencrypt_acme_sh_install with
 letsencrypt_acme_install.

---
 tasks/haproxy-letsencrypt-acme-sh.yml    | 2 +-
 tasks/main.yml                           | 2 +-
 templates/haproxy-letsencrypt-acme.sh.j2 | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/tasks/haproxy-letsencrypt-acme-sh.yml b/tasks/haproxy-letsencrypt-acme-sh.yml
index 98dfa43..c2ae902 100644
--- a/tasks/haproxy-letsencrypt-acme-sh.yml
+++ b/tasks/haproxy-letsencrypt-acme-sh.yml
@@ -19,5 +19,5 @@
     args:
       creates: '{{ pki_dir }}/haproxy/haproxy.pem'
 
-  when: letsencrypt_acme_sh_install
+  when: letsencrypt_acme_install
   tags: [ 'haproxy', 'letsencrypt', 'letsencrypt_acme_sh', 'haproxy_letsencrypt' ]
diff --git a/tasks/main.yml b/tasks/main.yml
index 8926c13..575d21c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
 - import_tasks: haproxy-letsencrypt-acme-sh.yml
   when:
     - haproxy_letsencrypt_managed
-    - letsencrypt_acme_sh_install
+    - letsencrypt_acme_install
 - import_tasks: haproxy-ssl.yml
   when: haproxy_letsencrypt_managed
 
diff --git a/templates/haproxy-letsencrypt-acme.sh.j2 b/templates/haproxy-letsencrypt-acme.sh.j2
index c54a657..412a24a 100644
--- a/templates/haproxy-letsencrypt-acme.sh.j2
+++ b/templates/haproxy-letsencrypt-acme.sh.j2
@@ -13,9 +13,6 @@ DATE=$( date )
 echo "$DATE" >> $LE_LOG_DIR/haproxy.log
 
 {% if letsencrypt_acme_install %}
-LE_ENV_FILE=/etc/default/letsencrypt
-{% endif %}
-{% if letsencrypt_acme_sh_install %}
 LE_ENV_FILE=/etc/default/acme_sh_request_env
 {% endif %}
 if [ -f "$LE_ENV_FILE" ] ; then