From 0be344b3c3d483d89f2e0bd4597cb430c1ff8a9c Mon Sep 17 00:00:00 2001
From: Ngure Nyaga <ngure.nyaga@savannahinformatics.com>
Date: Tue, 13 Jul 2021 03:55:50 +0300
Subject: [PATCH] fix: set defaults for Django environment variables

---
 bin/post_compile              | 22 ----------------------
 config/settings/base.py       | 16 ++++++++++------
 config/settings/local.py      |  2 +-
 config/settings/production.py |  2 +-
 4 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 bin/post_compile

diff --git a/bin/post_compile b/bin/post_compile
deleted file mode 100644
index a9c94b39..00000000
--- a/bin/post_compile
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-compress_enabled() {
-python << END
-import sys
-
-from environ import Env
-
-env = Env(COMPRESS_ENABLED=(bool, True))
-if env('COMPRESS_ENABLED'):
-    sys.exit(0)
-else:
-    sys.exit(1)
-
-END
-}
-
-if compress_enabled
-then
-  python manage.py compress
-fi
-python manage.py collectstatic --noinput
diff --git a/config/settings/base.py b/config/settings/base.py
index 9e03ec63..ebf8cc86 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -25,7 +25,7 @@
 # GENERAL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#debug
-DEBUG = env.bool("DJANGO_DEBUG", False)
+DEBUG = env.bool("DJANGO_DEBUG", default=False)
 # Local time zone. Choices are
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # though not all of them may be available with every OS.
@@ -49,11 +49,11 @@
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
 DATABASES = {
     "default": {
-        "NAME": env.str("POSTGRES_DB", "mle"),
-        "USER": env.str("POSTGRES_USER", "user"),
-        "PASSWORD": env.str("POSTGRES_PASSWORD", "somesecret"),
-        "HOST": env.str("POSTGRES_HOST", "localhost"),
-        "PORT": env.str("POSTGRES_PORT", None),
+        "NAME": env.str("POSTGRES_DB", default="mle"),
+        "USER": env.str("POSTGRES_USER", default="user"),
+        "PASSWORD": env.str("POSTGRES_PASSWORD", default="somesecret"),
+        "HOST": env.str("POSTGRES_HOST", default="localhost"),
+        "PORT": env.str("POSTGRES_PORT", default=None),
         "ENGINE": "django.db.backends.postgresql",
         "ATOMIC_REQUESTS": True,
     }
@@ -316,3 +316,7 @@
 
 MAX_IMAGE_HEIGHT = 4320
 MAX_IMAGE_WIDTH = 7680
+
+# minimal django-compressor settings
+COMPRESS_ENABLED = True
+COMPRESS_OFFLINE = True
diff --git a/config/settings/local.py b/config/settings/local.py
index 2738f26a..e7d2de1e 100644
--- a/config/settings/local.py
+++ b/config/settings/local.py
@@ -49,7 +49,7 @@
 }
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#internal-ips
 INTERNAL_IPS = ["127.0.0.1", "10.0.2.2"]
-if env("USE_DOCKER") == "yes":
+if env("USE_DOCKER", default="no") == "yes":
     import socket
 
     hostname, addresses, ips = socket.gethostbyname_ex(socket.gethostname())
diff --git a/config/settings/production.py b/config/settings/production.py
index 70b8512e..81b9dce7 100644
--- a/config/settings/production.py
+++ b/config/settings/production.py
@@ -10,7 +10,7 @@
 # GENERAL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = env("DJANGO_SECRET_KEY")
+SECRET_KEY = env("DJANGO_SECRET_KEY", default="this must be replaced")
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=[".savannahghi.org"])