kimbl
/
alakazam
forked from moritz/alakazam
0
0
Fork 0
Code Pull Requests Activity

parse GLOBALS:server from instance config

This commit is contained in:
Moritz 2023-11-01 01:32:25 +01:00
parent c197ad5548
commit 11d666c76d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alakazam.py
View File

@ -100,8 +100,6 @@ def merge_pool_configs(dir_path):
def merge_instance_configs(pool_config, instance_domain, instance_config):
merged_config = {}
for app, app_config in instance_config.items():
if not (server:= get_value(pool_config, 'GLOBALS', 'server')):
server = instance_domain
if app_config and pool_config.get(app):
merged_config[app] = merge_dict(pool_config[app], app_config)
elif app_config:
@ -111,8 +109,12 @@ def merge_instance_configs(pool_config, instance_domain, instance_config):
else:
merged_config[app] = {}
merged_config[app]['app_domain'] = map_subdomain(app, instance_domain, merged_config[app])
if not (server:= get_value(merged_config, 'GLOBALS', 'server')):
server = instance_domain
if not merged_config[app].get('server'):
merged_config[app]['server'] = server
if merged_config.get('GLOBALS'):
merged_config.pop('GLOBALS')
return merged_config
@ -131,7 +133,7 @@ def get_merged_instance_configs(pool_path, pool_configs):
instance_config = read_config(pool_path)
domain = pool_path.name.removesuffix('.yml').removesuffix('.yaml')
merged_config = merge_instance_configs(pool_configs[parent_path], domain, instance_config)
return {pool_path.name: merged_config}
return {domain: merged_config}
instances = {}
for root, _, files in os.walk(Path(pool_path)):
for file in files: