Remove no longer necessary traefik_config_certificatesResolvers_acme_…

…email Ref: spantaleev/matrix-docker-ansible-deploy#4014
mother-of-all-self-hosting · Jan 31, 2025 · 21b36ce · 21b36ce
1 parent 0c67263
commit 21b36ce
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -69,7 +69,6 @@ traefik_config_metrics_prometheus_entrypoint: metrics
 # By default, if the web-secure entrypoint is enabled, we enable Let's Encrypt.
 traefik_config_certificatesResolvers_acme_enabled: "{{ traefik_config_entrypoint_web_secure_enabled }}"
 traefik_config_certificatesResolvers_acme_name: default
-traefik_config_certificatesResolvers_acme_email: ''
 traefik_config_certificatesResolvers_acme_storage: /ssl/acme.json # in-container path
 # traefik_config_certificatesResolvers_acme_use_staging controls whether the Let's Encrypt staging environment is used or not.
 traefik_config_certificatesResolvers_acme_use_staging: false

diff --git a/tasks/validate_config.yml b/tasks/validate_config.yml
@@ -11,6 +11,7 @@
     - {'old': 'traefik_config_letsencrypt_resolver_caServer', 'new': 'traefik_config_certificatesResolvers_acme_caServer'}
     - {'old': 'traefik_config_letsencrypt_use_staging', 'new': 'traefik_config_certificatesResolvers_acme_use_staging'}
     - {'old': 'traefik_config_letsencrypt_httpChallenge_entrypoint', 'new': 'traefik_config_certificatesResolvers_acme_httpChallenge_entrypoint'}
+    - {'old': 'traefik_config_certificatesResolvers_acme_email', 'new': '<removed as no longer necessary - see https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/4014>'}
 
 - name: Fail if required Traefik settings not defined
   ansible.builtin.fail:
@@ -28,7 +29,6 @@
       You need to define a required configuration setting (`{{ item }}`) when enabling ACME SSL certificate resolvers.
   when: "traefik_config_certificatesResolvers_acme_enabled | bool and vars[item] == ''"
   with_items:
-    - traefik_config_certificatesResolvers_acme_email
     - traefik_config_certificatesResolvers_acme_httpChallenge_entrypoint
 
 - name: Fail if Traefik docker endpoint syntax invalid

diff --git a/templates/traefik.yml.j2 b/templates/traefik.yml.j2
@@ -106,7 +106,6 @@ certificatesResolvers:
 {% if traefik_config_certificatesResolvers_acme_enabled %}
   {{ traefik_config_certificatesResolvers_acme_name }}:
     acme:
-      email: {{ traefik_config_certificatesResolvers_acme_email | to_json }}
       storage: {{ traefik_config_certificatesResolvers_acme_storage | to_json }}
       caServer: {{ traefik_config_certificatesResolvers_acme_caServer | to_json }}
       {% if traefik_config_certificatesResolvers_acme_httpChallenge_enabled %}