From 17f44a418b3111787be9f0f9d0dd89c1c22f5d2a Mon Sep 17 00:00:00 2001 From: kj1352 Date: Wed, 6 Jul 2022 16:40:15 +0530 Subject: [PATCH] Moved settings to 2 division for local and staging --- manage.py | 2 +- workx_backend/asgi.py | 2 +- .../{settings.py => settings/base.py} | 35 ------------------- workx_backend/settings/local.py | 17 +++++++++ workx_backend/settings/staging.py | 21 +++++++++++ workx_backend/wsgi.py | 2 +- 6 files changed, 41 insertions(+), 38 deletions(-) rename workx_backend/{settings.py => settings/base.py} (78%) create mode 100644 workx_backend/settings/local.py create mode 100644 workx_backend/settings/staging.py diff --git a/manage.py b/manage.py index 8b366a3..111c582 100755 --- a/manage.py +++ b/manage.py @@ -6,7 +6,7 @@ import sys def main(): """Run administrative tasks.""" - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings') + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings.local') try: from django.core.management import execute_from_command_line except ImportError as exc: diff --git a/workx_backend/asgi.py b/workx_backend/asgi.py index f8e7a62..97e888d 100644 --- a/workx_backend/asgi.py +++ b/workx_backend/asgi.py @@ -11,6 +11,6 @@ import os from django.core.asgi import get_asgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings.local') application = get_asgi_application() diff --git a/workx_backend/settings.py b/workx_backend/settings/base.py similarity index 78% rename from workx_backend/settings.py rename to workx_backend/settings/base.py index e7fa41e..05127f5 100644 --- a/workx_backend/settings.py +++ b/workx_backend/settings/base.py @@ -1,15 +1,3 @@ -""" -Django settings for workx_backend project. - -Generated by 'django-admin startproject' using Django 4.0.6. - -For more information on this file, see -https://docs.djangoproject.com/en/4.0/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/4.0/ref/settings/ -""" - from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. @@ -24,10 +12,6 @@ SECRET_KEY = 'django-insecure--oe&1myti$m^yq^r_)uljs+mnl(k4hj13x1i)c6xrvm1s99obz # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] - -# Application definition - INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', @@ -40,17 +24,11 @@ INSTALLED_APPS = [ 'drfpasswordless' ] -PASSWORDLESS_AUTH = { - 'PASSWORDLESS_AUTH_TYPES': ['EMAIL'] -} - PASSWORDLESS_AUTH = { 'PASSWORDLESS_AUTH_TYPES': ['EMAIL'], 'PASSWORDLESS_EMAIL_NOREPLY_ADDRESS': 'kj@webtrigon.com', } -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -87,19 +65,6 @@ TEMPLATES = [ WSGI_APPLICATION = 'workx_backend.wsgi.application' -# Database -# https://docs.djangoproject.com/en/4.0/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - -# Password validation -# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators - AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', diff --git a/workx_backend/settings/local.py b/workx_backend/settings/local.py new file mode 100644 index 0000000..c1063f5 --- /dev/null +++ b/workx_backend/settings/local.py @@ -0,0 +1,17 @@ +from .base import * + +DEBUG = True + +ALLOWED_HOSTS = ['localhost'] + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + +# Database +# https://docs.djangoproject.com/en/4.0/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} \ No newline at end of file diff --git a/workx_backend/settings/staging.py b/workx_backend/settings/staging.py new file mode 100644 index 0000000..dde330c --- /dev/null +++ b/workx_backend/settings/staging.py @@ -0,0 +1,21 @@ +from .base import * + +DEBUG = True + +ALLOWED_HOSTS = ['167.71.228.78'] + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'workx_staging', + 'USER': 'webtrigon_admin', + 'PASSWORD': 'Nov7th2013', + 'HOST': '127.0.0.1', + 'PORT': '3306', + } +} + +EMAIL_BACKEND = "sendgrid_backend.SendgridBackend" +SENDGRID_API_KEY = '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' +SENDGRID_SANDBOX_MODE_IN_DEBUG = False + diff --git a/workx_backend/wsgi.py b/workx_backend/wsgi.py index 11c30a8..41c980e 100644 --- a/workx_backend/wsgi.py +++ b/workx_backend/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings') +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'workx_backend.settings.local') application = get_wsgi_application()