From 4989d2f87f148594896a0f9dde2de8844d774efa Mon Sep 17 00:00:00 2001 From: Disassembler Date: Fri, 10 Apr 2020 17:55:19 +0200 Subject: [PATCH] Include DOMAIN directly in HOST envvar for update-conf.sh --- usr/lib/python3.8/vmmgr/vmmgr.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr/lib/python3.8/vmmgr/vmmgr.py b/usr/lib/python3.8/vmmgr/vmmgr.py index 387a66e..989ff25 100644 --- a/usr/lib/python3.8/vmmgr/vmmgr.py +++ b/usr/lib/python3.8/vmmgr/vmmgr.py @@ -169,7 +169,6 @@ def update_app_config(app_name=None): env['VOLUMES_DIR'] = spoc_config.VOLUMES_DIR env['APPS_DIR'] = spoc_config.APPS_DIR env['LOG_DIR'] = spoc_config.LOG_DIR - env['DOMAIN'] = host['domain'] env['PORT'] = host['port'] env['EMAIL'] = common['email'] env['GMAPS_API_KEY'] = common['gmaps-api-key'] @@ -177,7 +176,7 @@ def update_app_config(app_name=None): for app_name in app_names: install_dir = os.path.join(spoc_config.APPS_DIR, app_name, 'install') script_path = os.path.join(install_dir, 'update-conf.sh') - env['HOST'] = apps[app_name]['host'] + env['HOST'] = f'{apps[app_name]["host"]}.{host["domain"]}' try: subprocess.run(script_path, cwd=install_dir, env=env) except: