Skip to content
This repository was archived by the owner on Feb 9, 2023. It is now read-only.

Enhancement for environment variables for easy developer landing. #96

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions trquake/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,22 @@
APPLICATIONS_DIR = BASE_DIR / "applications"
sys.path.append(str(APPLICATIONS_DIR))


env = environ.Env()

ENV_FILE = BASE_DIR / ".env"
if Path.is_file(ENV_FILE):
env.read_env(str(ENV_FILE))


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = env("DJANGO_SECRET_KEY")
SECRET_KEY = env.str("DJANGO_SECRET_KEY", "v0bhvhcarv6rh(wj2y$v$(b%5u$tq@i)h@^erp)$7rmmjql0#=")

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = []


# Application definition

INSTALLED_APPS = [
Expand Down Expand Up @@ -90,7 +87,6 @@

WSGI_APPLICATION = "trquake.wsgi.application"


# Database
# https://docs.djangoproject.com/en/4.1/ref/settings/#databases

Expand Down Expand Up @@ -120,7 +116,6 @@
},
]


# Internationalization
# https://docs.djangoproject.com/en/4.1/topics/i18n/

Expand All @@ -129,7 +124,6 @@
USE_I18N = True
USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/

Expand All @@ -141,16 +135,13 @@

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"


CELERY_BROKER_URL = env.str("CELERY_BROKER_URL", "redis://trquake-queue:6379")
CELERY_ACCEPT_CONTENT = ["json"]
CELERY_TASK_SERIALIZER = "json"
CELERY_RESULT_SERIALIZER = "json"


ZEKAI_USERNAME = env("ZEKAI_USERNAME")
ZEKAI_PASSWORD = env("ZEKAI_PASSWORD")

ZEKAI_USERNAME = env.str("ZEKAI_USERNAME", "")
ZEKAI_PASSWORD = env.str("ZEKAI_PASSWORD", "")

LOGGING = {
"version": 1,
Expand Down
11 changes: 5 additions & 6 deletions trquake/settings/development.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@

env = environ.Env()


DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
"NAME": env("POSTGRES_DB"),
"USER": env("POSTGRES_USER"),
"PASSWORD": env("POSTGRES_PASSWORD"),
"HOST": env("POSTGRES_HOST"),
"PORT": "5432",
"NAME": env.str("POSTGRES_DB", "postgres"),
"USER": env.str("POSTGRES_USER", ""),
"PASSWORD": env.str("POSTGRES_PASSWORD", ""),
"HOST": env.str("POSTGRES_HOST", "localhost"),
"PORT": env.str("PORT", "5432"),
}
}