fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated link on profile page
[cas.git]
/
src
/
cas
/
urls.py
diff --git
a/src/cas/urls.py
b/src/cas/urls.py
index
f1aeca6
..
4a285fd
100644
(file)
--- a/
src/cas/urls.py
+++ b/
src/cas/urls.py
@@
-1,17
+1,25
@@
# -*- coding: utf-8 -*-
from django.conf.urls.defaults import *
# -*- coding: utf-8 -*-
from django.conf.urls.defaults import *
+from django.views.generic.simple import redirect_to
from django.contrib import admin
from django.conf import settings
admin.autodiscover()
urlpatterns = patterns('',
from django.contrib import admin
from django.conf import settings
admin.autodiscover()
urlpatterns = patterns('',
+ url(r'^$', redirect_to, {'url': '/accounts/'}),
+
+ # django-cas-provider
+ url(r'^cas/', include('cas_provider.urls')),
+
# Admin panel
url(r'^admin/doc/', include('django.contrib.admindocs.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'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
+ {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
)
)