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

Use merge func instead for multi level dicts

Browse Source
This commit is contained in:
GeorgianaElena
2020-06-08 11:41:22 +03:00
parent 651425972f
commit 82f6173828
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tljh/traefik.py
View File

@@ -80,12 +80,14 @@ def compute_basic_auth(username, password):
hashed_password = str(ht.to_string()).split(":")[1][:-3] hashed_password = str(ht.to_string()).split(":")[1][:-3]
return username + ":" + hashed_password return username + ":" + hashed_password
def load_extra_config(std_toml, extra_config_dir):
def load_extra_config(extra_config_dir):
extra_configs = sorted(glob(os.path.join(extra_config_dir, '*.toml'))) 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(extra_configs)
return config return config
def ensure_traefik_config(state_dir): def ensure_traefik_config(state_dir):
"""Render the traefik.toml config file""" """Render the traefik.toml config file"""
traefik_std_config_file = os.path.join(state_dir, "traefik.toml") traefik_std_config_file = os.path.join(state_dir, "traefik.toml")
@@ -99,7 +101,7 @@ def ensure_traefik_config(state_dir):
with open(os.path.join(os.path.dirname(__file__), "traefik.toml.tpl")) as f: with open(os.path.join(os.path.dirname(__file__), "traefik.toml.tpl")) as f:
template = Template(f.read()) template = Template(f.read())
new_toml = template.render(config) std_config = template.render(config)
https = config["https"] https = config["https"]
letsencrypt = https["letsencrypt"] letsencrypt = https["letsencrypt"]
tls = https["tls"] tls = https["tls"]
@@ -117,18 +119,17 @@ def ensure_traefik_config(state_dir):
# Ensure extra config dir exists and is private # Ensure extra config dir exists and is private
os.makedirs(traefik_extra_config_dir, mode=0o700, exist_ok=True) os.makedirs(traefik_extra_config_dir, mode=0o700, exist_ok=True)
# Write standard config to file try:
with open(traefik_std_config_file, "w") as f: # Load standard config file merge it with the extra config files into a dict
os.fchmod(f.fileno(), 0o600) extra_config = load_extra_config(traefik_extra_config_dir)
f.write(new_toml) new_toml = _merge_dictionaries(toml.loads(std_config), extra_config)
except FileNotFoundError:
# Load standard config file and extra config files into a dict new_toml = toml.loads(std_config)
traefik_toml = load_extra_config(traefik_std_config_file, traefik_extra_config_dir)
# Dump the dict into a toml-formatted string and write it to file # Dump the dict into a toml-formatted string and write it to file
with open(traefik_std_config_file, "w") as f: with open(traefik_std_config_file, "w") as f:
os.fchmod(f.fileno(), 0o600) os.fchmod(f.fileno(), 0o600)
toml.dump(traefik_toml, f) toml.dump(new_toml, f)
with open(os.path.join(state_dir, "rules.toml"), "w") as f: with open(os.path.join(state_dir, "rules.toml"), "w") as f:
os.fchmod(f.fileno(), 0o600) os.fchmod(f.fileno(), 0o600)