Consolidate settings and use env vars.

settings/local.py can still be used for complex setting overrides but
environment variables is the preferred way to configure settings.

.gitignore

@@ -22,3 +22,4 @@ tmp/*
 .vagrant
 /env/
 /static/
+.env

manage.py

@@ -2,6 +2,10 @@
 import os
 import sys
 
+# Read .env file and inject it's values into the environment
+import dotenv
+dotenv.read_dotenv()
+
 # Edit this if necessary or override the variable in your environment.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings')
 

requirements.txt

@@ -165,3 +165,9 @@ tower==0.4.1
 
 # sha256: EeMy8qKdhkQ2S0ynm0rAed8yhibsjCesDozEVGlnGco
 translate-toolkit==1.12.0
+# sha256: 8uJz7TSsu1YJYtXPEpF5NtjfAil98JvTCJuFRtRYQTg
+# sha256: ygF2j97N4TQwHzFwdDIm9g7f9cOTXxJDc3jr2RFQY1M
+dj-database-url==0.3.0
+# sha256: 3-W4wr5as0NbPXHlocZrsU2oEE2kTvDdjMw-ipJ2Ftk
+# sha256: EgxGIdHk9a2r4KaDRj0b56WmuZLt1HZNMjxifSKSUeA
+django-dotenv==1.3.0

settings/__init__.py

@@ -1,6 +1,7 @@
 from .base import *
+
+# Import local settings if they exist (usually only in development).
 try:
     from .local import *
 except ImportError, exc:
-    exc.args = tuple(['%s (did you rename settings/local.py-dist?)' % exc.args[0]])
-    raise exc
+    pass