From 494eb09630db098813f35464fb5b679ef4015a1b Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Wed, 17 Oct 2012 17:13:08 +0200
Subject: disable asgard settings.d

---
 asgard/settings.d/10-apps.conf | 29 -----------------------------
 asgard/settings.d/20-saml.conf | 11 -----------
 meetingtools/settings.py       | 13 +++++++++++++
 settings.d/10-apps.conf        | 29 +++++++++++++++++++++++++++++
 settings.d/20-saml.conf        | 11 +++++++++++
 5 files changed, 53 insertions(+), 40 deletions(-)
 delete mode 100644 asgard/settings.d/10-apps.conf
 delete mode 100644 asgard/settings.d/20-saml.conf
 create mode 100644 settings.d/10-apps.conf
 create mode 100644 settings.d/20-saml.conf

diff --git a/asgard/settings.d/10-apps.conf b/asgard/settings.d/10-apps.conf
deleted file mode 100644
index 18180d6..0000000
--- a/asgard/settings.d/10-apps.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-
-INSTALLED_APPS += [
-        'django.contrib.auth',
-        'django.contrib.contenttypes',
-        'django.contrib.sessions',
-        'django.contrib.sites',
-        'django.contrib.admin',
-        'django.contrib.humanize',
-        'django_extensions',
-        'south',
-        'djcelery',
-        'ghettoq',
-        'djkombu',
-        'django_co_connector',
-        'django_co_acls',
-        'tagging',
-        'meetingtools.extensions',
-        'meetingtools.apps.auth',
-        'meetingtools.apps.room',
-        'meetingtools.apps.cluster',
-        'meetingtools.apps.userprofile',
-        'meetingtools.apps.stats',
-        'meetingtools.apps.sco',
-        'meetingtools.apps.archive'
-]
-
-DEBUG=True
-MEDIA_ROOT = "%s/static" % BASE_DIR
-ROOT_URLCONF = "meetingtools.urls"
\ No newline at end of file
diff --git a/asgard/settings.d/20-saml.conf b/asgard/settings.d/20-saml.conf
deleted file mode 100644
index 4116768..0000000
--- a/asgard/settings.d/20-saml.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-
-from django.conf import settings
-from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
-
-AUTH_PROFILE_MODULE = 'meetingtools.apps.userprofile.UserProfile'
-LOGIN_URL = '/saml2/sp/login/'
-LOGIN_REDIRECT_URL = "/rooms"
-
-#AUTHENTICATION_BACKENDS += ['asgard.saml.Saml2Backend']
-
-AUTO_REMOTE_SUPERUSERS = ['leifj@nordu.net']
\ No newline at end of file
diff --git a/meetingtools/settings.py b/meetingtools/settings.py
index 7f49c42..866ea53 100644
--- a/meetingtools/settings.py
+++ b/meetingtools/settings.py
@@ -130,6 +130,7 @@ INSTALLED_APPS = (
     'django_co_connector',
     'django_co_acls',
     'tagging',
+    'djangosaml2',
     'meetingtools.extensions',
     'meetingtools.apps.auth',
     'meetingtools.apps.room',
@@ -148,7 +149,19 @@ 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 *
+
+
 except ImportError:
     pass
\ No newline at end of file
diff --git a/settings.d/10-apps.conf b/settings.d/10-apps.conf
new file mode 100644
index 0000000..18180d6
--- /dev/null
+++ b/settings.d/10-apps.conf
@@ -0,0 +1,29 @@
+
+INSTALLED_APPS += [
+        'django.contrib.auth',
+        'django.contrib.contenttypes',
+        'django.contrib.sessions',
+        'django.contrib.sites',
+        'django.contrib.admin',
+        'django.contrib.humanize',
+        'django_extensions',
+        'south',
+        'djcelery',
+        'ghettoq',
+        'djkombu',
+        'django_co_connector',
+        'django_co_acls',
+        'tagging',
+        'meetingtools.extensions',
+        'meetingtools.apps.auth',
+        'meetingtools.apps.room',
+        'meetingtools.apps.cluster',
+        'meetingtools.apps.userprofile',
+        'meetingtools.apps.stats',
+        'meetingtools.apps.sco',
+        'meetingtools.apps.archive'
+]
+
+DEBUG=True
+MEDIA_ROOT = "%s/static" % BASE_DIR
+ROOT_URLCONF = "meetingtools.urls"
\ No newline at end of file
diff --git a/settings.d/20-saml.conf b/settings.d/20-saml.conf
new file mode 100644
index 0000000..4116768
--- /dev/null
+++ b/settings.d/20-saml.conf
@@ -0,0 +1,11 @@
+
+from django.conf import settings
+from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
+
+AUTH_PROFILE_MODULE = 'meetingtools.apps.userprofile.UserProfile'
+LOGIN_URL = '/saml2/sp/login/'
+LOGIN_REDIRECT_URL = "/rooms"
+
+#AUTHENTICATION_BACKENDS += ['asgard.saml.Saml2Backend']
+
+AUTO_REMOTE_SUPERUSERS = ['leifj@nordu.net']
\ No newline at end of file
-- 
cgit v1.1