From acc1eea251627fd559c53af945420dcc04ba8700 Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Tue, 2 Jun 2020 19:09:19 +0300 Subject: [PATCH] Traefik config files are .toml --- tests/test_traefik.py | 2 +- tljh/traefik.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_traefik.py b/tests/test_traefik.py index 863b414..ebe4b45 100644 --- a/tests/test_traefik.py +++ b/tests/test_traefik.py @@ -143,7 +143,7 @@ def test_extra_config(tmpdir, tljh_dir): "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) # This merges the 2 configs diff --git a/tljh/traefik.py b/tljh/traefik.py index 81342b7..1dd2312 100644 --- a/tljh/traefik.py +++ b/tljh/traefik.py @@ -81,7 +81,7 @@ def compute_basic_auth(username, password): return username + ":" + hashed_password 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 config = toml.load([std_toml] + extra_configs) return config