diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-11-07 14:39:29 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-11-07 14:39:29 +0100 |
| commit | 72efcafbd4dc984a87b2dad0ce4a6d0df8b339ae (patch) | |
| tree | b13ef6e73db3e8eea83689df212f19690e244df1 | |
| parent | ff616daf5f9aa1f348d23445b190a12b47821a57 (diff) | |
new oauth2
| -rw-r--r-- | coip/settings.py | 9 | ||||
| -rw-r--r-- | coip/urls.py | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/coip/settings.py b/coip/settings.py index ac51ddb..d3b86c9 100644 --- a/coip/settings.py +++ b/coip/settings.py @@ -66,7 +66,7 @@ SESSION_ENGINE = "django.contrib.sessions.backends.cache" TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.load_template_source', 'django.template.loaders.app_directories.load_template_source', -# 'django.template.loaders.eggs.load_template_source', + 'django.template.loaders.eggs.load_template_source', ) MIDDLEWARE_CLASSES = ( @@ -105,7 +105,8 @@ INSTALLED_APPS = ( 'ghettoq', 'djkombu', 'tastypie', - 'oauth_provider', + 'actstream', + 'django_oauth2_lite', 'coip.extensions', 'coip.apps.name', 'coip.apps.membership', @@ -114,7 +115,9 @@ INSTALLED_APPS = ( 'coip.apps.link', ) +OAUTH_REALM_KEY_NAME = 'http://coip-test.sunet.se' + CARROT_BACKEND = "django" import djcelery -djcelery.setup_loader()
\ No newline at end of file +djcelery.setup_loader() diff --git a/coip/urls.py b/coip/urls.py index 93deee7..c1470e0 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -73,5 +73,6 @@ urlpatterns = patterns('', # APIs (r'^api/', include(v1_api.urls)), (r'^opensocial/1.0/rpc', 'coip.apps.opensocial.common.system'), - (r'^opensocial/', include(opensocial_v1.urls)) + (r'^opensocial/', include(opensocial_v1.urls)), + (r'^oauth2/', include('django_oauth2_lite.urls')) ) |