Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 15:29:36 +02:00
Code Issues Releases Activity

Refactor database configuration to use a helper function for environment variables, improving compatibility with legacy setups.

Browse source
This commit is contained in:
Sean Morley 2025-05-26 17:18:30 -04:00
parent 5e6d5305cc
commit 3f6aa67b3f
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/server/main/settings.py
View file

@ -102,22 +102,30 @@ ROOT_URLCONF = 'main.urls'
# Database # Database
# https://docs.djangoproject.com/en/1.7/ref/settings/#databases # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
# Using legacy PG environment variables for compatibility with existing setups
def env(*keys, default=None):
"""Return the first non-empty environment variable from a list of keys."""
for key in keys:
value = os.getenv(key)
if value:
return value
return default
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.contrib.gis.db.backends.postgis', 'ENGINE': 'django.contrib.gis.db.backends.postgis',
'NAME': getenv('PGDATABASE') or getenv('POSTGRES_DB'), 'NAME': env('PGDATABASE', 'POSTGRES_DB'),
'USER': getenv('PGUSER') or getenv('POSTGRES_USER'), 'USER': env('PGUSER', 'POSTGRES_USER'),
'PASSWORD': getenv('PGPASSWORD') or getenv('POSTGRES_PASSWORD'), 'PASSWORD': env('PGPASSWORD', 'POSTGRES_PASSWORD'),
'HOST': getenv('PGHOST'), 'HOST': env('PGHOST', default='localhost'),
'PORT': getenv('PGPORT', 5432), 'PORT': env('PGPORT', default='5432'),
'OPTIONS': { 'OPTIONS': {
'sslmode': 'prefer', # Prefer SSL, but allow non-SSL connections 'sslmode': 'prefer', # Prefer SSL, but allow non-SSL connections
}, },
} }
} }
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.7/topics/i18n/ # https://docs.djangoproject.com/en/1.7/topics/i18n/