Merge pull request #857 from Inter-Actief/settings-refactor

Settings refactor
Inter-Actief · May 6, 2024 · 52e4cf4 · 52e4cf4
2 parents 5b0a879 + d9b9c87
commit 52e4cf4
Show file tree

Hide file tree

Showing 13 changed files with 411 additions and 16 deletions.
diff --git a/amelie/asgi.py b/amelie/asgi.py
@@ -9,7 +9,6 @@
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "amelie.settings.local")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "amelie.settings")
 
 application = get_asgi_application()
-
diff --git a/amelie/celeryapp.py b/amelie/celeryapp.py
@@ -6,7 +6,7 @@
 from celery import Celery
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'amelie.settings.local')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'amelie.settings')
 
 from django.conf import settings  # noqa
 

diff --git a/amelie/settings/__init__.py b/amelie/settings/__init__.py
@@ -1 +1,7 @@
 from amelie.settings.generic import *
+
+# Try to import local settings, fallback to config via environment variables if that fails
+try:
+	from amelie.settings.local import *
+except ImportError:
+	from amelie.settings.environ import *