* Let settings import localsettings if it exists, to allow for installation-specific...

 * Add a template for localsettings.
 * Set DEBUG to False (should be set to True in localsettings, if required).

diff --git a/localsettings.py.tmpl b/localsettings.py.tmpl
new file mode 100644 (file)
index 0000000..bf3ddb1
--- /dev/null
+++ b/localsettings.py.tmpl
@@ -0,0 +1,5 @@
+# Put any settings that are specific to this installation in here.
+# Any settings from settings.py can be overridden.
+
+# For example, enable debugging by commenting in the following line.
+#DEBUG = True

diff --git a/settings.py b/settings.py
index dfe7fce421646e63d02c792f1f340fd775822026..9393d9494882b9fae7dd0883e9edfca9f03b3c3b 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -1,11 +1,14 @@
 # Django settings for ee project.
 
-from dbsettings import *
 import os
 
+# Import database settings from a default file (so we can keep those out
+# of git).
+from dbsettings import *
+
 PROJECT_DIR = os.path.dirname(__file__)
 
-DEBUG = True
+DEBUG = False
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
@@ -115,4 +118,12 @@ AUTHENTICATION_BACKENDS = (
 )
 
 AUTH_PROFILE_MODULE = 'base.UserProfile'
+
+# Import local settings, that are specific to this installation. These
+# can override any settings specified here.
+try:
+    from localsettings import *
+except ImportError:
+    pass
+
 # vim: set sts=4 sw=4 expandtab: