aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--portal-gui/README11
-rw-r--r--portal-gui/rpkigui/myrpki/views.py5
-rw-r--r--portal-gui/rpkigui/settings.py.in13
3 files changed, 9 insertions, 20 deletions
diff --git a/portal-gui/README b/portal-gui/README
index e5a509ad..cf196835 100644
--- a/portal-gui/README
+++ b/portal-gui/README
@@ -161,17 +161,6 @@ You should run "load_csv" in *each* of your directories for each handle.
If you have configured django to use apached and mod_wsgi, you just need to
start your web server.
-Alternatively, Django comes with a test web server which is useful for small
-deployments, or for just testing the portal-gui. You can start the test
-server by running:
-
- $datarootdir/portal-gui/scripts/runserver [ IP:PORT ]
-
-where IP:PORT is the address where you want to run the server. If you don't
-specify the IP:PORT, the default is 127.0.0.1:8000.
-
-Now you can navigate to http://<ip:port>/myrpki/ to use the GUI.
-
=== Creating Users ===
By default, the administrative user created during the "Initialization" step
diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py
index 731e7d56..674d5af1 100644
--- a/portal-gui/rpkigui/myrpki/views.py
+++ b/portal-gui/rpkigui/myrpki/views.py
@@ -555,4 +555,9 @@ 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 e8bf2b7e..5a2c5ebc 100644
--- a/portal-gui/rpkigui/settings.py.in
+++ b/portal-gui/rpkigui/settings.py.in
@@ -67,7 +67,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,14 +104,9 @@ TEMPLATE_CONTEXT_PROCESSORS = (
)
# uncomment if using apache basic/digest http auth
-#AUTHENTICATION_BACKENDS = (
-# 'django.contrib.auth.backends.RemoteUserBackend',
-#)
-
-#
-# RPKI GUI specific
-#
-LOGIN_REDIRECT_URL='/myrpki/'
+AUTHENTICATION_BACKENDS = (
+ 'django.contrib.auth.backends.RemoteUserBackend',
+)
# Top of directory tree where myrpki.conf, etc are stored for each
# resource holder.