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

Traefik config files are .toml

Browse Source
This commit is contained in:
GeorgianaElena
2020-06-02 19:09:19 +03:00
parent 8c14372356
commit acc1eea251
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_traefik.py
View File

@@ -143,7 +143,7 @@ def test_extra_config(tmpdir, tljh_dir):
"checkNewVersion": False "checkNewVersion": False
} }
with open(os.path.join(extra_config_dir, "extra.py"), "w+") as extra_config_file: with open(os.path.join(extra_config_dir, "extra.toml"), "w+") as extra_config_file:
toml.dump(extra_config, extra_config_file) toml.dump(extra_config, extra_config_file)
# This merges the 2 configs # This merges the 2 configs

2
tljh/traefik.py
View File

@@ -81,7 +81,7 @@ def compute_basic_auth(username, password):
return username + ":" + hashed_password return username + ":" + hashed_password
def load_extra_config(std_toml, extra_config_dir): def load_extra_config(std_toml, extra_config_dir):
extra_configs = sorted(glob(os.path.join(extra_config_dir, '*.py'))) extra_configs = sorted(glob(os.path.join(extra_config_dir, '*.toml')))
# Load the toml list of files into dicts and merge them # Load the toml list of files into dicts and merge them
config = toml.load([std_toml] + extra_configs) config = toml.load([std_toml] + extra_configs)
return config return config