summaryrefslogtreecommitdiff
path: root/meetingtools/settings.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2012-10-31 00:11:52 +0100
committerLeif Johansson <leifj@sunet.se>2012-10-31 00:11:52 +0100
commitea0442b4797fdc34414d1b0c3153298e214766f6 (patch)
treef2b36f2a58c69a50308c67af345dd7d2f6401083 /meetingtools/settings.py
parent0d218d69284497581c869ecc1606cfd173e87745 (diff)
stats in DB
Diffstat (limited to 'meetingtools/settings.py')
-rw-r--r--meetingtools/settings.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/meetingtools/settings.py b/meetingtools/settings.py
index dac6890..0bb0ca1 100644
--- a/meetingtools/settings.py
+++ b/meetingtools/settings.py
@@ -56,6 +56,7 @@ USE_I18N = True
# If you set this to False, Django will not format dates, numbers and
# calendars according to the current locale
USE_L10N = True
+USE_TZ = True
STATIC_ROOT = "%s/static" % BASE_DIR
STATIC_URL = "/static/"
@@ -149,18 +150,15 @@ djcelery.setup_loader()
NOREPLY = "no-reply@sunet.se"
AUTH_PROFILE_MODULE = "userprofile.UserProfile"
-from django.conf import settings
-from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
-
LOGIN_URL = '/saml2/sp/login/'
LOGIN_REDIRECT_URL = "/rooms"
-AUTHENTICATION_BACKENDS += ('asgard.saml.Saml2Backend',)
-
AUTO_REMOTE_SUPERUSERS = ['leifj@nordu.net']
try:
from asgard.loader import *
DEBUG=True
+
+ AUTHENTICATION_BACKENDS += ('asgard.saml.Saml2Backend',)
except ImportError,ex:
print ex