From 7f0c1ad735f0c6917dc5c3ace07d167d9f29928f Mon Sep 17 00:00:00 2001
From: Nathan Chapman <nchapman@iworq.com>
Date: Fri, 5 Aug 2022 15:52:14 -0600
Subject: [PATCH] Update settings for production

---
 src/indici/config.py   | 16 ++++++++--------
 src/indici/settings.py | 10 ++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/indici/config.py b/src/indici/config.py
index 12e2335..835719e 100644
--- a/src/indici/config.py
+++ b/src/indici/config.py
@@ -6,17 +6,17 @@ load_dotenv()
 DEBUG = os.environ.get('DEBUG', 'True') == 'True'
 
 DATABASE_CONFIG = {
-    'port': os.environ.get('DATABASE_PORT', ''),
-    'host': os.environ.get('DATABASE_HOST', ''),
-    'password': os.environ.get('DATABASE_PASSWORD', ''),
-    'user': os.environ.get('DATABASE_USER', ''),
-    'name': os.environ.get('DATABASE_NAME', ''),
-    'engine': os.environ.get('DATABASE_ENGINE', ''),
+    'ENGINE': os.environ.get('DATABASE_ENGINE', ''),
+    'HOST': os.environ.get('DATABASE_HOST', ''),
+    'PORT': os.environ.get('DATABASE_PORT', ''),
+    'NAME': os.environ.get('DATABASE_NAME', ''),
+    'USER': os.environ.get('DATABASE_USER', ''),
+    'PASSWORD': os.environ.get('DATABASE_PASSWORD', ''),
 }
 SECRET_KEY = os.environ.get('SECRET_KEY', '')
 CACHE_CONFIG = {
-    'location': os.environ.get('CACHE_LOCATION', ''),
-    'backend': os.environ.get('CACHE_BACKEND', ''),
+    'BACKEND': os.environ.get('CACHE_BACKEND', 'django.core.cache.backends.redis.RedisCache'),
+    'LOCATION': os.environ.get('CACHE_LOCATION', 'redis://127.0.0.1:6379'),
 }
 
 STATIC_ROOT_PATH = os.environ.get('STATIC_ROOT_PATH', '/var/www/indici/static/')
diff --git a/src/indici/settings.py b/src/indici/settings.py
index a5a5c06..6f82834 100644
--- a/src/indici/settings.py
+++ b/src/indici/settings.py
@@ -81,17 +81,11 @@ WSGI_APPLICATION = 'indici.wsgi.application'
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    }
+    'default': DATABASE_CONFIG
 }
 
 CACHE = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.redis.RedisCache',
-        'LOCATION': 'redis://127.0.0.1:6379',
-    }
+    'default': CACHE_CONFIG
 }
 
 # Password validation