Remove references to local.py and docker.py

- Put all settings in settings/base.py
- All settings are expected to be environment variables from now on

Author: cache-rules

config/settings/base.py

@@ -13,6 +13,8 @@
 import os
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+from nerd_herder.utils import init_logging
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
@@ -23,9 +25,9 @@
 SECRET_KEY = os.environ.get("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = os.environ.get("DEBUG") == "TRUE"
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ["*"]
 
 
 # Application definition
@@ -81,16 +83,33 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
+POSTGRES_HOST = os.environ.get("POSTGRES_HOST", "postgres")
+POSTGRES_PORT = os.environ.get("POSTGRES_PORT", "5432")
+POSTGRES_USER = os.environ.get("POSTGRES_USER", "postgres")
+POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD")
+POSTGRES_DB = os.environ.get("POSTGRES_DB", "nerd_herder")
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": POSTGRES_DB,
+        "USER": POSTGRES_USER,
+        "PASSWORD": POSTGRES_PASSWORD,
+        "HOST": POSTGRES_HOST,
+        "PORT": POSTGRES_PORT,
     }
 }
 
-CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
+REDIS_HOST = os.environ.get("REDIS_HOST", "redis")
+REDIS_PORT = os.environ.get("REDIS_PORT", "6379")
+
+CACHES = {
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": f"redis://{REDIS_HOST}:{REDIS_PORT}/0",
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
+    }
+}
 
 # User substitution
 # https://docs.djangoproject.com/en/1.11/topics/auth/customizing/#auth-custom-user
@@ -138,3 +157,5 @@
 SLACK_BOT_NAME = os.environ.get("SLACK_BOT_NAME", "nerd_herder")
 SLACK_BOT_EMOJI = os.environ.get("SLACK_BOT_EMOJI", "snake")
 SLACK_TALK_PROPOSAL_CHANNEL = os.environ.get("SLACK_TALK_PROPOSAL_CHANNEL", "talk_proposals")
+
+init_logging()

config/settings/docker.py

@@ -11,6 +11,6 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base")
 
 application = get_wsgi_application()

config/wsgi.py

@@ -11,6 +11,6 @@ COPY manage.py .
 COPY nerd_herder ./nerd_herder
 COPY wait-for-it.sh .
 EXPOSE 8080
-ENV DJANGO_SETTINGS_MODULE config.settings.docker
+ENV DJANGO_SETTINGS_MODULE config.settings.base
 
 CMD [ "./wait-for-it.sh", "postgres:5432", "--", "gunicorn", "config.wsgi", "-b", "0.0.0.0:8080" ]

docker/nerd_herder/Dockerfile

@@ -3,7 +3,7 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc: