summaryrefslogtreecommitdiff
path: root/sublab_project/settings.py
diff options
context:
space:
mode:
authorMarkus Zapke-Grùˆndemann <info@keimlink.de>2012-01-04 23:58:44 +0100
committerMarkus Zapke-Grùˆndemann <info@keimlink.de>2012-01-04 23:58:44 +0100
commit7e960881ae6cbcd709538dcd73e4fd89e33507d3 (patch)
treeceea18c587ca1efe4f1877e3b891fa7d61948a06 /sublab_project/settings.py
parent9d873fd644b9cc265ad63dbc33f308dbd888ca19 (diff)
Added model, admin, tests and tasks for calendarium.
Diffstat (limited to 'sublab_project/settings.py')
-rw-r--r--sublab_project/settings.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/sublab_project/settings.py b/sublab_project/settings.py
index d35e5c7..e52008a 100644
--- a/sublab_project/settings.py
+++ b/sublab_project/settings.py
@@ -133,6 +133,8 @@ INSTALLED_APPS = (
'gunicorn',
'news',
'projects',
+ 'djcelery',
+ 'calendarium',
)
# A sample logging configuration. The only tangible logging
@@ -189,6 +191,13 @@ AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend',
)
+import djcelery
+djcelery.setup_loader()
+
+BROKER_URL = 'redis://localhost:6379/0'
+
+CALENDARIUM_IMPORT_URL = 'https://sublab.org:5232/calendars/events'
+
try:
from local_settings import *
except ImportError: