ISTI-ansible-roles
/
ansible-role-haproxy
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace letsencrypt_acme_sh_install with letsencrypt_acme_install.

This commit is contained in:
Andrea Dell'Amico 2023-10-16 19:10:55 +02:00
parent f468a48ffa
commit 3340e8f779
Signed by: adellam
GPG Key ID: 147ABE6CEB9E20FF
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/haproxy-letsencrypt-acme-sh.yml
View File

@ -19,5 +19,5 @@
args: args:
creates: '{{ pki_dir }}/haproxy/haproxy.pem' creates: '{{ pki_dir }}/haproxy/haproxy.pem'
when: letsencrypt_acme_sh_install when: letsencrypt_acme_install
tags: [ 'haproxy', 'letsencrypt', 'letsencrypt_acme_sh', 'haproxy_letsencrypt' ] tags: [ 'haproxy', 'letsencrypt', 'letsencrypt_acme_sh', 'haproxy_letsencrypt' ]

2
tasks/main.yml
View File

@ -9,7 +9,7 @@
- import_tasks: haproxy-letsencrypt-acme-sh.yml - import_tasks: haproxy-letsencrypt-acme-sh.yml
when: when:
- haproxy_letsencrypt_managed - haproxy_letsencrypt_managed
- letsencrypt_acme_sh_install - letsencrypt_acme_install
- import_tasks: haproxy-ssl.yml - import_tasks: haproxy-ssl.yml
when: haproxy_letsencrypt_managed when: haproxy_letsencrypt_managed

3
templates/haproxy-letsencrypt-acme.sh.j2
View File

@ -13,9 +13,6 @@ DATE=$( date )
echo "$DATE" >> $LE_LOG_DIR/haproxy.log echo "$DATE" >> $LE_LOG_DIR/haproxy.log
{% if letsencrypt_acme_install %} {% 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 LE_ENV_FILE=/etc/default/acme_sh_request_env
{% endif %} {% endif %}
if [ -f "$LE_ENV_FILE" ] ; then if [ -f "$LE_ENV_FILE" ] ; then