X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=settings.py;fp=settings.py;h=9393d9494882b9fae7dd0883e9edfca9f03b3c3b;hb=6e1daff6b9d4aaf18b4fb67494888a9eb5b47be7;hp=dfe7fce421646e63d02c792f1f340fd775822026;hpb=4747f5ee71f66f8ee68425fb7c3e544e6f2ff5b1;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/settings.py b/settings.py
index dfe7fce..9393d94 100644
--- 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: