diff options
author | Leif Johansson <leifj@sunet.se> | 2012-10-04 15:39:08 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2012-10-04 15:39:08 +0200 |
commit | 2bdad0ae7a3a6e4ec5116becd39910388b679ed2 (patch) | |
tree | 5afdfba0a93c1af50d53bdc245d57cc4053e109a /src/asgard | |
parent | 873e7823970352d591deee5f67f47c5436ee0e84 (diff) |
restructure
Diffstat (limited to 'src/asgard')
-rw-r--r-- | src/asgard/asgard.json | 3 | ||||
-rw-r--r-- | src/asgard/settings.d/10-apps.conf | 26 | ||||
-rw-r--r-- | src/asgard/settings.d/20-saml.conf | 22 | ||||
-rw-r--r-- | src/asgard/venv.conf | 33 |
4 files changed, 0 insertions, 84 deletions
diff --git a/src/asgard/asgard.json b/src/asgard/asgard.json deleted file mode 100644 index 2c28ed3..0000000 --- a/src/asgard/asgard.json +++ /dev/null @@ -1,3 +0,0 @@ -{ -"type": "django" -} diff --git a/src/asgard/settings.d/10-apps.conf b/src/asgard/settings.d/10-apps.conf deleted file mode 100644 index 4dac23c..0000000 --- a/src/asgard/settings.d/10-apps.conf +++ /dev/null @@ -1,26 +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' -] - -DEBUG=True -MEDIA_ROOT = "%s/static" % BASE_DIR
\ No newline at end of file diff --git a/src/asgard/settings.d/20-saml.conf b/src/asgard/settings.d/20-saml.conf deleted file mode 100644 index e623bb5..0000000 --- a/src/asgard/settings.d/20-saml.conf +++ /dev/null @@ -1,22 +0,0 @@ - -from django.conf import settings -from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT - -AUTH_PROFILE_MODULE = 'profile.UserProfile' - -SAML_ATTRIBUTE_MAPPING = { - 'username': ['eduPersonPrincipalName'], - 'first_name': ['givenName'], - 'last_name': ['sn'], - 'display_name': ['displayName','cn'] -} - -LOGIN_URL = '/auth/login/' -SESSION_EXPIRE_AT_BROWSER_CLOSE = True -SAML_METADATA_FILE = "/var/run/swamid-idp-transitive.xml" -SAML_CREATE_UNKNOWN_USER = True -SAML_CONFIG_LOADER = "meetingtools.apps.auth.asgard_sp_config" - -#AUTHENTICATION_BACKENDS += ['keybucket.utils.saml.TargetedUsernameSamlBackend'] - -AUTO_REMOTE_SUPERUSERS = ['leifj@nordu.net']
\ No newline at end of file diff --git a/src/asgard/venv.conf b/src/asgard/venv.conf deleted file mode 100644 index ae4ba0a..0000000 --- a/src/asgard/venv.conf +++ /dev/null @@ -1,33 +0,0 @@ -Django -python-dateutil==1.5.0 -South -Werkzeug -anyjson -celery -demjson -distribute -django-avatar -django-celery -django-evolution -django-extensions -django-form-utils -django-kombu -django-oauth -django-picklefield -django-tagging -feedparser -generateDS -ghettoq -iso8601 -kombu -lxml -morbid -mysql-connector-python -odict -ordereddict -pySAML2 -suds -uuid -git+git://github.com/berggren/django-co-acls.git -git+git://github.com/berggren/django-co-connector.git -pytz |