Single Deploy Settings

conf/salt/project/django/init.sls

@@ -14,7 +14,7 @@ manage:
     - mode: 700
     - template: jinja
     - context:
-        settings: "{{ pillar['project_name']}}.settings.{{ pillar['environment'] }}"
+        settings: "{{ pillar['project_name']}}.settings.deploy"
         virtualenv_root: "{{ vars.venv_dir }}"
         directory: "{{ vars.source_dir }}"
     - require:

conf/salt/project/django/manage.sh

@@ -1,6 +1,7 @@
 # Shell script to setup necessary environment variables and run a management command
-export DJANGO_SETTINGS_MODULE={{ settings }}
-export ALLOWED_HOSTS={{ pillar['domain'] }}
+export DJANGO_SETTINGS_MODULE='{{ settings }}'
+export ALLOWED_HOSTS='{{ pillar["domain"] }}'
+export ENVIRONMENT='{{ pillar["environment"] }}'
 {% for key, value in pillar.get('secrets', {}).items() + pillar.get('env', {}).items() %}
 export {{ key }}='{{ value }}'
 {% endfor %}

conf/salt/project/web/app.sls

@@ -26,7 +26,7 @@ gunicorn_conf:
     - template: jinja
     - context:
         log_dir: "{{ vars.log_dir }}"
-        settings: "{{ pillar['project_name'] }}.settings.{{ pillar['environment'] }}"
+        settings: "{{ pillar['project_name'] }}.settings.deploy"
         virtualenv_root: "{{ vars.venv_dir }}"
         directory: "{{ vars.source_dir }}"
     - require:

conf/salt/project/web/gunicorn.conf

@@ -10,7 +10,7 @@ stopwaitsecs=60
 stdout_logfile={{ log_dir }}/gunicorn.log
 redirect_stderr=true
 stderr_logfile={{ log_dir }}/gunicorn.error.log
-environment=DJANGO_SETTINGS_MODULE="{{ settings }}",ALLOWED_HOSTS="{{ pillar['domain'] }}",
+environment=DJANGO_SETTINGS_MODULE="{{ settings }}",ENVIRONMENT="{{ pillar['environment'] }}",ALLOWED_HOSTS="{{ pillar['domain'] }}",
     {%- for key, value in pillar.get('secrets', {}).items() + pillar.get('env', {}).items() -%}
         {{ key }}="{{ value }}"{%- if not loop.last -%},{%- endif -%}
     {%- endfor -%}

conf/salt/project/worker/beat.sls

@@ -15,7 +15,7 @@ beat_conf:
     - template: jinja
     - context:
         log_dir: "{{ vars.log_dir }}"
-        settings: "{{ pillar['project_name'] }}.settings.{{ pillar['environment'] }}"
+        settings: "{{ pillar['project_name'] }}.settings.deploy"
         virtualenv_root: "{{ vars.venv_dir }}"
         directory: "{{ vars.source_dir }}"
         name: "celery-beat"

conf/salt/project/worker/celery.conf

@@ -13,7 +13,7 @@ startsecs=1
 ; Need to wait for currently executing tasks to finish at shutdown.
 ; Increase this if you have very long running tasks.
 stopwaitsecs=60
-environment=DJANGO_SETTINGS_MODULE="{{ settings }}",ALLOWED_HOSTS="{{ pillar['domain'] }}",
+environment=DJANGO_SETTINGS_MODULE="{{ settings }}",ENVIRONMENT="{{ pillar['environment'] }}",ALLOWED_HOSTS="{{ pillar['domain'] }}",
     {%- for key, value in pillar.get('secrets', {}).items() + pillar.get('env', {}).items() -%}
         {{ key }}="{{ value }}"{%- if not loop.last -%},{%- endif -%}
     {%- endfor -%}

conf/salt/project/worker/default.sls

@@ -16,7 +16,7 @@ default_conf:
     - template: jinja
     - context:
         log_dir: "{{ vars.log_dir }}"
-        settings: "{{ pillar['project_name'] }}.settings.{{ pillar['environment'] }}"
+        settings: "{{ pillar['project_name'] }}.settings.deploy"
         virtualenv_root: "{{ vars.venv_dir }}"
         directory: "{{ vars.source_dir }}"
         name: "celery-default"

project_name/settings/staging.py → project_name/settings/deploy.py

@@ -1,13 +1,16 @@
-from {{ project_name }}.settings.base import *  # noqa
+# Settings for live deployed environments: vagrant, staging, production, etc
+from .base import *  # noqa
 
 os.environ.setdefault('CACHE_HOST', '127.0.0.1:11211')
 os.environ.setdefault('BROKER_HOST', '127.0.0.1:5672')
 
+ENVIRONMENT = os.environ['ENVIRONMENT']
+
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
-DATABASES['default']['NAME'] = '{{ project_name }}_staging'
-DATABASES['default']['USER'] = '{{ project_name }}_staging'
+DATABASES['default']['NAME'] = '{{ project_name }}_%s' % ENVIRONMENT.lower()
+DATABASES['default']['USER'] = '{{ project_name }}_%s' % ENVIRONMENT.lower()
 DATABASES['default']['HOST'] = os.environ.get('DB_HOST', '')
 DATABASES['default']['PORT'] = os.environ.get('DB_PORT', '')
 DATABASES['default']['PASSWORD'] = os.environ['DB_PASSWORD']
@@ -30,7 +33,7 @@
     }
 }
 
-EMAIL_SUBJECT_PREFIX = '[{{ project_name|title }} Staging] '
+EMAIL_SUBJECT_PREFIX = '[{{ project_name|title }} %s] ' % ENVIRONMENT.title()
 
 COMPRESS_ENABLED = True
 
@@ -43,3 +46,9 @@
 # Uncomment if using celery worker configuration
 # CELERY_SEND_TASK_ERROR_EMAILS = True
 # BROKER_URL = 'amqp://{{ project_name }}_staging:%(BROKER_PASSWORD)s@%(BROKER_HOST)s/{{ project_name }}_staging' % os.environ  # noqa
+
+# Environment overrides
+# These should be kept to an absolute minimum
+if ENVIRONMENT.upper() == 'LOCAL':
+    # Don't send emails from the Vagrant boxes
+    EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'