mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2025-07-23 06:49:37 +02:00
Refactor database configuration to use a helper function for environment variables, improving compatibility with legacy setups.
This commit is contained in:
parent
5e6d5305cc
commit
3f6aa67b3f
1 changed files with 15 additions and 7 deletions
|
@ -102,22 +102,30 @@ ROOT_URLCONF = 'main.urls'
|
|||
# Database
|
||||
# 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 = {
|
||||
'default': {
|
||||
'ENGINE': 'django.contrib.gis.db.backends.postgis',
|
||||
'NAME': getenv('PGDATABASE') or getenv('POSTGRES_DB'),
|
||||
'USER': getenv('PGUSER') or getenv('POSTGRES_USER'),
|
||||
'PASSWORD': getenv('PGPASSWORD') or getenv('POSTGRES_PASSWORD'),
|
||||
'HOST': getenv('PGHOST'),
|
||||
'PORT': getenv('PGPORT', 5432),
|
||||
'NAME': env('PGDATABASE', 'POSTGRES_DB'),
|
||||
'USER': env('PGUSER', 'POSTGRES_USER'),
|
||||
'PASSWORD': env('PGPASSWORD', 'POSTGRES_PASSWORD'),
|
||||
'HOST': env('PGHOST', default='localhost'),
|
||||
'PORT': env('PGPORT', default='5432'),
|
||||
'OPTIONS': {
|
||||
'sslmode': 'prefer', # Prefer SSL, but allow non-SSL connections
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.7/topics/i18n/
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue