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 two YUI javascript files.
[matthijs/projects/xerxes.git]
/
settings.py
diff --git
a/settings.py
b/settings.py
index ba3582d320d897fbe6efcfa3e3004da143b456fa..655a76926478ddb83c57d9aac4141fb9c6a7290e 100644
(file)
--- a/
settings.py
+++ b/
settings.py
@@
-1,15
+1,19
@@
-# Django settings for
ee
project.
+# Django settings for
xerxes
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 = (
- # ('Your Name', 'your_email@domain.com'),
+ # Server errors get sent here
+ ('Matthijs Kooijman', 'matthijs@stdin.nl'),
)
MANAGERS = ADMINS
)
MANAGERS = ADMINS
@@
-47,7
+51,7
@@
MEDIA_ROOT = ''
MEDIA_URL = ''
# URL prefix for static files. Will be made available by
MEDIA_URL = ''
# URL prefix for static files. Will be made available by
-#
ee
.tools.context_processors.static
+#
xerxes
.tools.context_processors.static
STATIC_URL_PREFIX = '/static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
STATIC_URL_PREFIX = '/static/'
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
@@
-75,7
+79,7
@@
MIDDLEWARE_CLASSES = (
#'django.middleware.locale.LocaleMiddleware',
)
#'django.middleware.locale.LocaleMiddleware',
)
-ROOT_URLCONF = '
ee
.urls'
+ROOT_URLCONF = '
xerxes
.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
@@
-88,12
+92,12
@@
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
- 'django.contrib.sites',
'django.contrib.admin',
'django.contrib.admin',
- 'ee.events',
- 'ee.influences',
- 'ee.base',
- 'ee.tools',
+ 'xerxes.events',
+ 'xerxes.influences',
+ 'xerxes.base',
+ 'xerxes.tools',
+ 'threadedcomments',
)
TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_CONTEXT_PROCESSORS = (
@@
-101,7
+105,7
@@
TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
# Add STATIC_URL_PREFIX to the context
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
# Add STATIC_URL_PREFIX to the context
- "
ee
.tools.context_processors.static",
+ "
xerxes
.tools.context_processors.static",
)
LOGIN_URL = "/accounts/login/"
)
LOGIN_URL = "/accounts/login/"
@@
-110,8
+114,17
@@
LOGIN_REDIRECT_URL = "/influences/"
# Allow authentication against the phpb user accounts
AUTHENTICATION_BACKENDS = (
# Allow authentication against the phpb user accounts
AUTHENTICATION_BACKENDS = (
- '
ee
.auth.PhpBBBackend',
+ '
xerxes
.auth.PhpBBBackend',
'django.contrib.auth.backends.ModelBackend',
)
AUTH_PROFILE_MODULE = 'base.UserProfile'
'django.contrib.auth.backends.ModelBackend',
)
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: