novaburst/funquail
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

chore: Move database url composition from custom script to django settings

Browse source 
Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2313>
This commit is contained in:
Georg Krause 2023-01-10 13:20:14 +01:00 • committed by Marge
commit 62653a2f62
6 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/config/settings/common.py
View file

@ -369,7 +369,15 @@ vars().update(EMAIL_CONFIG)
# DATABASE CONFIGURATION
# ------------------------------------------------------------------------------
# See: https://docs.djangoproject.com/en/dev/ref/settings/#databases
DATABASE_URL = env.db("DATABASE_URL")
DATABASE_USER = env.str("POSTGRES_ENV_POSTGRES_USER", "postgres")
DATABASE_PASSWORD = env.str("POSTGRES_ENV_POSTGRES_PASSWORD")
DATABASE_NAME = env.str("POSTGRES_ENV_POSTGRES_USER")
DATABASE_HOST = "postgres"
DATABASE_PORT = 5432
DATABASE_URL = env.db(
"DATABASE_URL",
f"postgres://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}",
)
"""
The URL used to connect to the PostgreSQL database. Examples: