X-Git-Url: https://git.mdrn.pl/cas.git/blobdiff_plain/a7d807af1096c152baf5c32f4f4b3f1a26ea2c76..de84f8005cbb194987bd71fd2e1282f3a113f3cf:/src/cas/urls.py

diff --git a/src/cas/urls.py b/src/cas/urls.py
index f1aeca6..29c63e3 100644
--- a/src/cas/urls.py
+++ b/src/cas/urls.py
@@ -1,17 +1,34 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import include, patterns, url
+from django.views.generic import RedirectView
 from django.contrib import admin
 from django.conf import settings
+from django.views.defaults import page_not_found
 
 admin.autodiscover()
 
+
 urlpatterns = patterns('',
+    url(r'^$', RedirectView.as_view(url='/accounts/')),
+
+    # django-cas-provider
+    url(r'^cas/', include('cas_provider.urls')),
+
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^admin/(.*)', admin.site.root),
+    url(r'^admin/', include(admin.site.urls)),
 
-    # django-cas-provider
-    url(r'^', include('cas_provider.urls')),
+    url(r'^accounts/', include('accounts.urls')),
+
+    url(r'^accounts/', include('accounts.urls')),
+    url(r'^auth/(email|signup|login|logout|confirm_email)', page_not_found),
+    url(r'^auth/', include('allauth.urls')),
 )
 
 
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )