From 0acdf08ff0ea294c87c608c1452ba359db5fc8ce Mon Sep 17 00:00:00 2001 From: juliusbentz Date: Tue, 9 Oct 2018 22:49:05 +0200 Subject: [PATCH] import dev_settings in settings.py; not the other way development settings should be imported to settings.py development settings differ from one developer to anoteher so they shouldn't be tracked --- .gitignore | 1 + crm/dev_settings.py | 17 ----------------- crm/settings.py | 5 +++++ 3 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 crm/dev_settings.py diff --git a/.gitignore b/.gitignore index a97dca3f..b9ff4402 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ main.css.map ref.css ref.css.map .coverage +crm/dev_settings\.py diff --git a/crm/dev_settings.py b/crm/dev_settings.py deleted file mode 100644 index 4a67856f..00000000 --- a/crm/dev_settings.py +++ /dev/null @@ -1,17 +0,0 @@ -from .settings import * - -# Database -# https://docs.djangoproject.com/en/1.11/ref/settings/#databases -ALLOWED_HOSTS = ['*'] - -DEBUG = True - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'HOST': 'db', - 'PORT': 5432, - } -} \ No newline at end of file diff --git a/crm/settings.py b/crm/settings.py index 0d9b9f5f..fadadab5 100644 --- a/crm/settings.py +++ b/crm/settings.py @@ -185,3 +185,8 @@ SG_PWD = os.getenv('SG_PWD', '') MANDRILL_API_KEY = os.getenv('MANDRILL_API_KEY', '') ADMIN_EMAIL = "admin@micropyramid.com" + +try: + from .dev_settings import * +except ImportError: + pass