Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Honor DB username as set in env file #11522

Merged
merged 1 commit into from
Sep 22, 2023
Merged

Honor DB username as set in env file #11522

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,22 +504,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


Expand Down
Loading