https fixes

[cas.git] / src / cas / urls.py

diff --git a/src/cas/urls.py b/src/cas/urls.py
index f1aeca6..5b67eb1 100644 (file)
--- a/src/cas/urls.py
+++ b/src/cas/urls.py
@@ -1,17 +1,28 @@
 # -*- 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
 
 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')),
 )
 
 
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )