Flatten settings

Close #126

Author: bhrutledge

.coveragerc

@@ -8,12 +8,12 @@ source =
 [report]
 omit =
     */migrations/*
-    hth/settings/prod.py
     hth/wsgi.py
 skip_covered = true
 exclude_lines =
     pragma: no cover
     if settings.DEBUG
+    if DEBUG
     ; https://github.com/bhrutledge/jahhills.com/issues/67
     AdminTestCase
     SeleniumTestCase

README.md

@@ -10,11 +10,11 @@ As with the [first iteration](http://github.com/bhrutledge/hallelujahthehills.co
 
 Clone this repo.
 
-Create and activate a Python 3.6 virtual environment.
+Create and activate a Python 3.7 virtual environment.
 
-Copy `hth/settings/env.example` to `.env` in the same directory, then edit to change settings.
+Copy `hth/env.example` to `.env` in the same directory, then edit to change settings.
 
-Set `DJANGO_SETTINGS_MODULE=hth.settings.dev`, e.g. using [direnv](https://direnv.net/)
+Set `DJANGO_SETTINGS_MODULE=hth.settings DEBUG=True`, e.g. using [direnv](https://direnv.net/)
 
 Bootstrap and validate the environment with `make`.
 
@@ -49,6 +49,6 @@ SSH to server.
 
 Activate virtual environment.
 
-Update environment with `DJANGO_SETTINGS_MODULE=hth.settings.prod make`
+Update environment with `DJANGO_SETTINGS_MODULE=hth.settings make`
 
 Restart process with `supervisorctl restart jahhills`.

hth/settings/env.example hth/env.example

@@ -1,23 +1,29 @@
 """
 Django settings for hth project.
 
-For more information on this file, see
+For more information on this file, see:
 https://docs.djangoproject.com/en/dev/topics/settings/
+https://docs.djangoproject.com/en/dev/howto/deployment/checklist/
 
-For the full list of settings and their values, see
+For the full list of settings and their values, see:
 https://docs.djangoproject.com/en/dev/ref/settings/
 """
 
 import environ
 
-project_root = environ.Path(__file__) - 3
+project_root = environ.Path(__file__) - 2
 src_root = project_root.path('hth')
 
-env = environ.Env()
+env = environ.Env(
+    DEBUG=(bool, False)
+)
 env.read_env()
 
+
 # Application definition
 
+DEBUG = env('DEBUG')
+
 INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
@@ -37,6 +43,12 @@
     'hth.music',
 )
 
+if DEBUG:
+    INSTALLED_APPS += (
+        'debug_toolbar.apps.DebugToolbarConfig',
+        'django_extensions',
+    )
+
 MIDDLEWARE_CLASSES = (
     'debug_toolbar.middleware.DebugToolbarMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
@@ -54,8 +66,9 @@
 WSGI_APPLICATION = 'hth.wsgi.application'
 
 
-# Database
+# Database & Cache
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
+# https://docs.djangoproject.com/en/dev/ref/settings/#caches
 
 DATABASES = {
     'default': {
@@ -64,6 +77,12 @@
     }
 }
 
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+    }
+}
+
 
 # Internationalization
 # https://docs.djangoproject.com/en/dev/topics/i18n/
@@ -129,6 +148,20 @@
 SERVER_EMAIL = env('SERVER_EMAIL')
 
 
-# Secrets
+# Security
 
 SECRET_KEY = env('SECRET_KEY')
+
+ALLOWED_HOSTS = [] if DEBUG else [
+    '127.0.0.1',
+    'localhost',
+    '.debugged.org',
+    '.hallelujahthehills.com',
+]
+
+
+# App settings
+
+DEBUG_TOOLBAR_CONFIG = {
+    'JQUERY_URL': '',
+}

hth/settings/base.py hth/settings.py

@@ -1,5 +1,5 @@
 [pytest]
-DJANGO_SETTINGS_MODULE = hth.settings.dev
+DJANGO_SETTINGS_MODULE = hth.settings
 testpaths = hth
 addopts =
     --disable-warnings

hth/settings/__init__.py

@@ -5,7 +5,7 @@
 # Need `exec` for `supervisorctl stop` to work
 exec gunicorn \
     --pythonpath "${BASH_SOURCE%/*}" \
-    --env DJANGO_SETTINGS_MODULE=hth.settings.prod \
+    --env DJANGO_SETTINGS_MODULE=hth.settings \
     --bind 127.0.0.01:13149 \
     --workers 4 \
     --access-logfile - \