aboutsummaryrefslogtreecommitdiff
path: root/portal-gui/rpkigui
diff options
context:
space:
mode:
Diffstat (limited to 'portal-gui/rpkigui')
-rw-r--r--portal-gui/rpkigui/myrpki/views.py5
-rw-r--r--portal-gui/rpkigui/settings.py.in5
2 files changed, 3 insertions, 7 deletions
diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py
index 206d334f..f15ebbdd 100644
--- a/portal-gui/rpkigui/myrpki/views.py
+++ b/portal-gui/rpkigui/myrpki/views.py
@@ -554,9 +554,4 @@ def upload_myrpki_xml(request, self_handle):
return serve_file(self_handle, 'myrpki.xml', 'application/xml')
-# apache is configured to set REMOTE_USER when the user visits /accounts/login/
-# simply redirect to the dashboard page since the user will already be logged in
-def login(request):
- return http.HttpResponseRedirect('/myrpki/')
-
# vim:sw=4 ts=8 expandtab
diff --git a/portal-gui/rpkigui/settings.py.in b/portal-gui/rpkigui/settings.py.in
index 178d6010..d9ae3fb4 100644
--- a/portal-gui/rpkigui/settings.py.in
+++ b/portal-gui/rpkigui/settings.py.in
@@ -66,7 +66,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware',
# uncomment if using apache basic/digest http auth
- 'django.contrib.auth.middleware.RemoteUserMiddleware',
+ #'django.contrib.auth.middleware.RemoteUserMiddleware',
# order is important here. if csrfmidware is put before condgetmidware,
# the returned pages get truncated for some reason!
@@ -104,7 +104,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
# uncomment if using apache basic/digest http auth
AUTHENTICATION_BACKENDS = (
- 'django.contrib.auth.backends.RemoteUserBackend',
+ #'django.contrib.auth.backends.RemoteUserBackend',
+ 'django.contrib.auth.backends.ModelBackend',
)
# Top of directory tree where rpki.conf, etc are stored for each