aboutsummaryrefslogtreecommitdiff
path: root/rpkid/portal-gui
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid/portal-gui')
-rw-r--r--rpkid/portal-gui/apache.conf.in3
-rwxr-xr-xrpkid/portal-gui/manage.py5
-rw-r--r--rpkid/portal-gui/scripts/rpki-manage.in4
-rw-r--r--rpkid/portal-gui/scripts/rpkigui-rcynic.py2
-rw-r--r--rpkid/portal-gui/settings.py.in1
5 files changed, 14 insertions, 1 deletions
diff --git a/rpkid/portal-gui/apache.conf.in b/rpkid/portal-gui/apache.conf.in
index 24afe371..133d014a 100644
--- a/rpkid/portal-gui/apache.conf.in
+++ b/rpkid/portal-gui/apache.conf.in
@@ -28,4 +28,7 @@ Allow from all
Alias /media/ @INSTDIR@/media/
Alias /site_media/ @INSTDIR@/media/
+# redirect to the dashboard when someone hits the bare vhost
+RedirectMatch ^/$ /rpki/
+
# vim:ft=apache
diff --git a/rpkid/portal-gui/manage.py b/rpkid/portal-gui/manage.py
new file mode 100755
index 00000000..4be5a84f
--- /dev/null
+++ b/rpkid/portal-gui/manage.py
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+export PYTHONPATH=$PWD:$(dirname $PWD)
+export DJANGO_SETTINGS_MODULE=settings
+django-admin.py $*
diff --git a/rpkid/portal-gui/scripts/rpki-manage.in b/rpkid/portal-gui/scripts/rpki-manage.in
new file mode 100644
index 00000000..843ecc5b
--- /dev/null
+++ b/rpkid/portal-gui/scripts/rpki-manage.in
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+export PYTHONPATH=@PYTHONPATH@${PYTHONPATH:+:}${PYTHONPATH} DJANGO_SETTINGS_MODULE=settings
+@DJANGO_ADMIN@ $*
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 7735df7d..439a091a 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -196,7 +196,7 @@ def process_cache(root, xml_file):
qs = models.Cert.objects.filter(
keyid=obj.aki,
name=obj.issuer,
- repo__statuses=object_accepted
+ repo__statuses__status=object_accepted
)
ncerts = len(qs)
if ncerts == 0:
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index 8d607480..10705ef8 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -91,6 +91,7 @@ INSTALLED_APPS = (
'rpki.gui.app',
'rpki.gui.cacheview',
'rpki.gui.routeview',
+ 'south'
)
TEMPLATE_CONTEXT_PROCESSORS = (