diff --git a/roles/letsencrypt/templates/domains.txt.j2 b/roles/letsencrypt/templates/domains.txt.j2 index d94c42a..c1693e9 100644 --- a/roles/letsencrypt/templates/domains.txt.j2 +++ b/roles/letsencrypt/templates/domains.txt.j2 @@ -8,16 +8,6 @@ {% endif %} {% endfor %} {% endif %} -{% if role_wh_proxy | default(False) %} -{% for client in wh_clients | default([]) %} -{% for app in client.apps %} -{% set app = wh_default_app | combine(app, recursive=True) %} -{% if app.letsencrypt_cert %} -{{ app.vhost | default(client.name + '-' + app.name + '.wh.fws.fr') }} {{ app.aliases | join(' ') }} -{% endif %} -{% endfor %} -{% endfor %} -{% endif %} {% if pve_letsencrypt is defined and pve_letsencrypt and inventory_hostname not in letsencrypt_certs | default([]) | map(attribute='common_name') %} {{ inventory_hostname }} {{ pve_cluster_vhosts | join(' ') }} {% endif %} @@ -27,10 +17,7 @@ {% if zcs_letsencrypt is defined and zcs_letsencrypt and inventory_hostname not in letsencrypt_certs | default([]) | map(attribute='common_name') %} {{ inventory_hostname }} {{ zcs_vhosts | default([]) | join(' ') }} {% endif %} -{% if bitwarden_letsencrypt_cert is defined and bitwarden_letsencrypt_cert == True %} -{{ bitwarden_public_url | urlsplit('hostname') }} -{% endif %} -{% if vaultwarden_letsencrypt_cert is defined and vaultwarden_letsencrypt_cert == True %} +{% if vaultwarden_letsencrypt_cert is defined and vaultwarden_letsencrypt_cert == True and vaultwarden_public_url | urlsplit('hostname') not in letsencrypt_certs | default([]) | map(attribute='common_name') %} {{ vaultwarden_public_url | urlsplit('hostname') }} {% endif %} {% if psono_letsencrypt_cert is defined and psono_letsencrypt_cert == True %}