From 776ff5273b553d61cde4fa29365ae39ae1ab806b Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Tue, 16 May 2023 13:05:34 +0200
Subject: [PATCH] update letsEncrypt config after testing

verified this works now
---
 tests/test_traefik.py         |  8 ++++----
 tljh/traefik-dynamic.toml.tpl | 12 ++++++------
 tljh/traefik.toml.tpl         |  5 ++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/tests/test_traefik.py b/tests/test_traefik.py
index f78898f..472b3b8 100644
--- a/tests/test_traefik.py
+++ b/tests/test_traefik.py
@@ -114,13 +114,13 @@ def test_letsencrypt_config(tljh_dir):
             }
         },
     }
-    assert "certificateResolvers" in cfg
-    assert "letsencrypt" in cfg["certificateResolvers"]
+    assert "certificatesResolvers" in cfg
+    assert "letsencrypt" in cfg["certificatesResolvers"]
 
-    assert cfg["certificateResolvers"]["letsencrypt"]["acme"] == {
+    assert cfg["certificatesResolvers"]["letsencrypt"]["acme"] == {
         "email": "fake@jupyter.org",
         "storage": "acme.json",
-        "httpChallenge": {"entryPoint": "http"},
+        "tlsChallenge": {},
     }
 
 
diff --git a/tljh/traefik-dynamic.toml.tpl b/tljh/traefik-dynamic.toml.tpl
index b7e96d2..a233f1d 100644
--- a/tljh/traefik-dynamic.toml.tpl
+++ b/tljh/traefik-dynamic.toml.tpl
@@ -5,21 +5,21 @@
   [tls.options.default]
   minVersion = "VersionTLS12"
 
-  {% if https['tls']['cert'] %}
+  {% if https['tls']['cert'] -%}
   [tls.stores.default.defaultCertificate]
     certFile = "{{ https['tls']['cert'] }}"
     keyFile = "{{ https['tls']['key'] }}"
-  {% endif %}
+  {%- endif %}
 
-  {% if https['letsencrypt']['email'] and https['letsencrypt']['domains'] %}
+  {% if https['letsencrypt']['email'] and https['letsencrypt']['domains'] -%}
   [tls.stores.default.defaultGeneratedCert]
   resolver = "letsencrypt"
     [tls.stores.default.defaultGeneratedCert.domain]
     main = "{{ https['letsencrypt']['domains'][0] }}"
     sans = [
-      {% for domain in https['letsencrypt']['domains'][1:] %}
+      {% for domain in https['letsencrypt']['domains'][1:] -%}
       "{{ domain }}",
-      {% endfor %}
+      {%- endfor %}
     ]
-  {% endif %}
+  {%- endif %}
 {% endif %}
diff --git a/tljh/traefik.toml.tpl b/tljh/traefik.toml.tpl
index eb6a8ee..0c4ac8c 100644
--- a/tljh/traefik.toml.tpl
+++ b/tljh/traefik.toml.tpl
@@ -44,11 +44,10 @@ X-Xsrftoken = "redact"
   address = "localhost:{{ traefik_api['port'] }}"
 
 {% if https['enabled'] and https['letsencrypt']['email'] and https['letsencrypt']['domains'] %}
-[certificateResolvers.letsencrypt.acme]
+[certificatesResolvers.letsencrypt.acme]
 email = "{{ https['letsencrypt']['email'] }}"
 storage = "acme.json"
-[certificateResolvers.letsencrypt.acme.httpChallenge]
-entryPoint = "http"
+[certificatesResolvers.letsencrypt.acme.tlsChallenge]
 {% endif %}
 
 [providers]