diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-12 04:05:47 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-12 04:05:47 +0000 |
| commit | 446299e9189331fc09fe6b838919bf8d0ff2a7e8 (patch) | |
| tree | fcecc2e854e5b43bbdf4f96e3eb8436fd7eef0a3 /rpkid/portal-gui | |
| parent | 7935cc245662541328446e98e4c315678a2254aa (diff) | |
| parent | 53a89ee6c1d1bf3ada5b1ba55b533d4ff2e61543 (diff) | |
merge with /trunk
svn path=/branches/tk274/; revision=4849
Diffstat (limited to 'rpkid/portal-gui')
| -rw-r--r-- | rpkid/portal-gui/apache.conf.in | 3 | ||||
| -rwxr-xr-x | rpkid/portal-gui/manage.py | 5 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpki-manage.in | 4 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-rcynic.py | 2 | ||||
| -rw-r--r-- | rpkid/portal-gui/settings.py.in | 1 |
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 = ( |