rhouben/pda-next
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed up the env/environ clutter.
All checks were successful
pda-new unit tests / Run-unit-tests (push) Successful in 12s
Details

Browse Source
This commit is contained in:
RensHouben
2025-10-17 14:28:09 +02:00
parent 9897d7a217
commit c4548a7cca
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/config/settings.py
View File

@@ -1,8 +1,7 @@
""" """
Django settings for PDA-New Django settings for PDA-New
Generated by 'django-admin startproject' using Django 5.2.5. Originally generated by 'django-admin startproject' using Django 5.2.5.
""" """
import os import os
@@ -73,22 +72,22 @@ TEMPLATES = [
WSGI_APPLICATION = "config.wsgi.application" WSGI_APPLICATION = "config.wsgi.application"
DB_ENGINE=os.environ.get('DB_ENGINE', default='sqlite3') DB_ENGINE=env('DB_ENGINE', default='sqlite3')
DEFAULT_DB = { DEFAULT_DB = {
'ENGINE': f"django.db.backends.{DB_ENGINE}", 'ENGINE': f"django.db.backends.{DB_ENGINE}",
} }
if DB_ENGINE=='sqlite3': if DB_ENGINE=='sqlite3':
DEFAULT_DB['NAME'] = os.path.join('BASE_DIR', DEFAULT_DB['NAME'] = os.path.join('BASE_DIR',
os.environ.get('DB_NAME', default='urania.sqlite3')) env('DB_NAME', default='pdanext.sqlite3'))
else: else:
DEFAULT_DB['NAME'] = os.environ.get('DB_NAME') DEFAULT_DB['NAME'] = env('DB_NAME')
DEFAULT_DB['USER'] = os.environ.get('DB_USER') DEFAULT_DB['USER'] = env('DB_USER')
DEFAULT_DB['PASSWORD'] = os.environ.get('DB_PASSWORD') DEFAULT_DB['PASSWORD'] = env('DB_PASSWORD')
DEFAULT_DB['HOST'] = os.environ.get('DB_HOST') DEFAULT_DB['HOST'] = env('DB_HOST')
if DB_ENGINE=='postgresql': if DB_ENGINE=='postgresql':
DEFAULT_DB['PORT'] = os.environ.get('DB_PORT', default=5432) DEFAULT_DB['PORT'] = env('DB_PORT', default=5432)
elif DB_ENGINE=='mysql': elif DB_ENGINE=='mysql':
DEFAULT_DB['PORT'] = os.environ.get('DB_PORT', default=3306) DEFAULT_DB['PORT'] = env('DB_PORT', default=3306)
DATABASES = { DATABASES = {
'default': DEFAULT_DB, 'default': DEFAULT_DB,
@@ -109,14 +108,10 @@ AUTH_PASSWORD_VALIDATORS = [
}, },
] ]
LANGUAGE_CODE = "en-us" LANGUAGE_CODE = env('DJANGO_LANGUAGE_CODE', default="en-us")
TIME_ZONE = env("DJANGO_TIME_ZONE", default="UTC")
TIME_ZONE = "UTC" USE_I18N = env.bool('DJANGO_USE_I18N', default=True)
USE_TZ = env.bool('DJANGO_USE_TZ', default=True)
USE_I18N = True
USE_TZ = True
STATIC_URL = "static/" STATIC_URL = "static/"
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"