projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add an encode_email tag library used to somewhat encode email addresses. Code...
[matthijs/projects/xerxes.git]
/
settings.py
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.
# Django settings for ee project.
-from dbsettings import *
import os
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__)
PROJECT_DIR = os.path.dirname(__file__)
-DEBUG =
Tru
e
+DEBUG =
Fals
e
TEMPLATE_DEBUG = DEBUG
ADMINS = (
TEMPLATE_DEBUG = DEBUG
ADMINS = (
@@
-115,4
+118,12
@@
AUTHENTICATION_BACKENDS = (
)
AUTH_PROFILE_MODULE = 'base.UserProfile'
)
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:
# vim: set sts=4 sw=4 expandtab: