From 6012eab88d9d251fea1a49a012fbf617d25f9131 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Sun, 30 Dec 2018 19:07:41 +0100 Subject: [PATCH] Simplify settings.py --- .../{settings/__init__.py => settings.py} | 25 ++++++++++++++++--- ungleichotpserver/settings/dev.py | 10 -------- ungleichotpserver/settings/prod.py | 12 --------- 3 files changed, 22 insertions(+), 25 deletions(-) rename ungleichotpserver/{settings/__init__.py => settings.py} (89%) delete mode 100644 ungleichotpserver/settings/dev.py delete mode 100644 ungleichotpserver/settings/prod.py diff --git a/ungleichotpserver/settings/__init__.py b/ungleichotpserver/settings.py similarity index 89% rename from ungleichotpserver/settings/__init__.py rename to ungleichotpserver/settings.py index e4cc629..c540505 100644 --- a/ungleichotpserver/settings/__init__.py +++ b/ungleichotpserver/settings.py @@ -123,8 +123,27 @@ USE_TZ = True STATIC_URL = '/static/' +DEBUG_DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + } +} + +DEBUG = False +ALLOWED_HOSTS = [ + ".ungleich.ch" +] + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'app', + } +} if "DEBUG" in os.environ: - from .local import * # flake8: noqa -else: - from .prod import * # flake8: noqa + DEBUG = True + ALLOWED_HOSTS = [] + + DATABASES = DEBUG_DATABASES diff --git a/ungleichotpserver/settings/dev.py b/ungleichotpserver/settings/dev.py deleted file mode 100644 index 71fc018..0000000 --- a/ungleichotpserver/settings/dev.py +++ /dev/null @@ -1,10 +0,0 @@ -DEBUG = True - -ALLOWED_HOSTS = [] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } -} diff --git a/ungleichotpserver/settings/prod.py b/ungleichotpserver/settings/prod.py deleted file mode 100644 index 63a493f..0000000 --- a/ungleichotpserver/settings/prod.py +++ /dev/null @@ -1,12 +0,0 @@ -DEBUG = False - -ALLOWED_HOSTS = [ - ".ungleich.ch" -] - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'app', - } -}