fnp
/
cas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change password generator
[cas.git]
/
src
/
cas
/
urls.py
diff --git
a/src/cas/urls.py
b/src/cas/urls.py
index
9db4e41
..
1c90a76
100644
(file)
--- a/
src/cas/urls.py
+++ b/
src/cas/urls.py
@@
-1,29
+1,35
@@
-# -*- coding: utf-8 -*-
-from django.conf.urls import include, url
+from django.urls import path, include
from django.views.generic import RedirectView
from django.contrib import admin
from django.conf import settings
from django.views.generic import RedirectView
from django.contrib import admin
from django.conf import settings
-admin.autodiscover()
+
+admin.site.site_header = settings.SITE_TITLE
+
urlpatterns = [
urlpatterns = [
-
url(r'^$', RedirectView.as_view(url='/accounts/'
, permanent=False)),
+
path('', RedirectView.as_view(url=settings.LOGIN_REDIRECT_URL
, permanent=False)),
# django-cas-provider
# django-cas-provider
- url(r'^cas/', include('cas_provider.urls')),
+ path('cas/', include('cas_provider.urls')),
+
+ path('openid/', include('oidc_provider.urls', namespace='oidc_provider')),
# Admin panel
# Admin panel
-
url(r'^
admin/doc/', include('django.contrib.admindocs.urls')),
-
url(r'^admin/', include(admin.site.urls)
),
+
path('
admin/doc/', include('django.contrib.admindocs.urls')),
+
path('admin/', admin.site.urls
),
- url(r'^accounts/', include('accounts.urls')),
+ path('accounts/', include('accounts.urls')),
+ path('email/', include('emails.urls')),
+ path('services/', include('services.urls')),
+ path('ssh/', include('ssh_keys.urls')),
+ path('auth/', include('django.contrib.auth.urls')),
]
if settings.DEBUG:
]
if settings.DEBUG:
- from django.views.static import serve
- urlpatterns += [
- url(r'^media/(?P<path>.*)$', serve, {
- 'document_root': settings.MEDIA_ROOT,
- }),
- ]
+ from django.conf.urls.static import static
+ urlpatterns += static(
+ settings.MEDIA_URL,
+ document_root=settings.MEDIA_ROOT
+ )