zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update letsEncrypt config after testing

Browse Source 
verified this works now
This commit is contained in:
Min RK
2023-05-16 13:05:34 +02:00
parent a58956f14b
commit 776ff5273b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_traefik.py
View File

@@ -114,13 +114,13 @@ def test_letsencrypt_config(tljh_dir):
} }
}, },
} }
assert "certificateResolvers" in cfg assert "certificatesResolvers" in cfg
assert "letsencrypt" in cfg["certificateResolvers"] assert "letsencrypt" in cfg["certificatesResolvers"]
assert cfg["certificateResolvers"]["letsencrypt"]["acme"] == { assert cfg["certificatesResolvers"]["letsencrypt"]["acme"] == {
"email": "fake@jupyter.org", "email": "fake@jupyter.org",
"storage": "acme.json", "storage": "acme.json",
"httpChallenge": {"entryPoint": "http"}, "tlsChallenge": {},
} }

12
tljh/traefik-dynamic.toml.tpl
View File

@@ -5,21 +5,21 @@
[tls.options.default] [tls.options.default]
minVersion = "VersionTLS12" minVersion = "VersionTLS12"
{% if https['tls']['cert'] %} {% if https['tls']['cert'] -%}
[tls.stores.default.defaultCertificate] [tls.stores.default.defaultCertificate]
certFile = "{{ https['tls']['cert'] }}" certFile = "{{ https['tls']['cert'] }}"
keyFile = "{{ https['tls']['key'] }}" 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] [tls.stores.default.defaultGeneratedCert]
resolver = "letsencrypt" resolver = "letsencrypt"
[tls.stores.default.defaultGeneratedCert.domain] [tls.stores.default.defaultGeneratedCert.domain]
main = "{{ https['letsencrypt']['domains'][0] }}" main = "{{ https['letsencrypt']['domains'][0] }}"
sans = [ sans = [
{% for domain in https['letsencrypt']['domains'][1:] %} {% for domain in https['letsencrypt']['domains'][1:] -%}
"{{ domain }}", "{{ domain }}",
{% endfor %} {%- endfor %}
] ]
{% endif %} {%- endif %}
{% endif %} {% endif %}

5
tljh/traefik.toml.tpl
View File

@@ -44,11 +44,10 @@ X-Xsrftoken = "redact"
address = "localhost:{{ traefik_api['port'] }}" address = "localhost:{{ traefik_api['port'] }}"
{% if https['enabled'] and https['letsencrypt']['email'] and https['letsencrypt']['domains'] %} {% if https['enabled'] and https['letsencrypt']['email'] and https['letsencrypt']['domains'] %}
[certificateResolvers.letsencrypt.acme] [certificatesResolvers.letsencrypt.acme]
email = "{{ https['letsencrypt']['email'] }}" email = "{{ https['letsencrypt']['email'] }}"
storage = "acme.json" storage = "acme.json"
[certificateResolvers.letsencrypt.acme.httpChallenge] [certificatesResolvers.letsencrypt.acme.tlsChallenge]
entryPoint = "http"
{% endif %} {% endif %}
[providers] [providers]