From a1b5b9ba5f6c3a806b310b737902180b0efbc90f Mon Sep 17 00:00:00 2001 From: Giovanni Allegri Date: Fri, 22 Sep 2023 15:53:55 +0200 Subject: [PATCH] Honor DB username as set in env file --- src/tasks.py | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/tasks.py b/src/tasks.py index 3ec6b717..41d46e9a 100644 --- a/src/tasks.py +++ b/src/tasks.py @@ -531,22 +531,26 @@ def _container_exposed_port(component, instname): def _update_db_connstring(): - user = os.getenv("GEONODE_DATABASE", "geonode") - pwd = os.getenv("GEONODE_DATABASE_PASSWORD", "geonode") - dbname = os.getenv("GEONODE_DATABASE", "geonode") - dbhost = os.getenv("DATABASE_HOST", "db") - dbport = os.getenv("DATABASE_PORT", 5432) - connstr = f"postgis://{user}:{pwd}@{dbhost}:{dbport}/{dbname}" + connstr = os.getenv("DATABASE_URL", None) + if not connstr: + user = os.getenv("GEONODE_DATABASE_USER", "geonode") + pwd = os.getenv("GEONODE_DATABASE_PASSWORD", "geonode") + dbname = os.getenv("GEONODE_DATABASE", "geonode") + dbhost = os.getenv("DATABASE_HOST", "db") + dbport = os.getenv("DATABASE_PORT", 5432) + connstr = f"postgis://{user}:{pwd}@{dbhost}:{dbport}/{dbname}" return connstr def _update_geodb_connstring(): - geouser = os.getenv("GEONODE_GEODATABASE", "geonode_data") - geopwd = os.getenv("GEONODE_GEODATABASE_PASSWORD", "geonode_data") - geodbname = os.getenv("GEONODE_GEODATABASE", "geonode_data") - dbhost = os.getenv("DATABASE_HOST", "db") - dbport = os.getenv("DATABASE_PORT", 5432) - geoconnstr = f"postgis://{geouser}:{geopwd}@{dbhost}:{dbport}/{geodbname}" + geoconnstr = os.getenv("GEODATABASE_URL", None) + if not geoconnstr: + geouser = os.getenv("GEONODE_GEODATABASE_USER", "geonode_data") + geopwd = os.getenv("GEONODE_GEODATABASE_PASSWORD", "geonode_data") + geodbname = os.getenv("GEONODE_GEODATABASE", "geonode_data") + dbhost = os.getenv("DATABASE_HOST", "db") + dbport = os.getenv("DATABASE_PORT", 5432) + geoconnstr = f"postgis://{geouser}:{geopwd}@{dbhost}:{dbport}/{geodbname}" return geoconnstr