diff options
Diffstat (limited to 'rpkid/portal-gui')
| -rw-r--r-- | rpkid/portal-gui/Makefile.in | 6 | ||||
| -rw-r--r-- | rpkid/portal-gui/apache.conf.in | 3 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpki-manage.in | 2 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-rcynic.py | 3 | ||||
| -rw-r--r-- | rpkid/portal-gui/settings.py.in | 3 |
5 files changed, 6 insertions, 11 deletions
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index a453552b..a7cd4519 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -41,16 +41,10 @@ apache.conf: $(srcdir)/apache.conf.in Makefile install: $(BUILD) if test -d $(SYSCONFDIR); then :; else ${INSTALL} -d $(SYSCONFDIR); fi - if test -d $(INSTDIR)/media/css; then :; else ${INSTALL} -d $(INSTDIR)/media/css; fi - if test -d $(INSTDIR)/media/img; then :; else ${INSTALL} -d $(INSTDIR)/media/img; fi - if test -d $(INSTDIR)/media/js; then :; else ${INSTALL} -d $(INSTDIR)/media/js; fi if test -d $(INSTDIR)/wsgi; then :; else ${INSTALL} -d $(INSTDIR)/wsgi; fi ${INSTALL} -m 644 apache.conf $(SYSCONFDIR)/apache.conf - ${INSTALL} -m 644 $(srcdir)/media/css/bootstrap.min.css $(INSTDIR)/media/css/bootstrap.min.css - ${INSTALL} -m 644 $(srcdir)/media/js/jquery-1.8.3.min.js $(INSTDIR)/media/js/jquery.min.js ${INSTALL} -m 644 rpki.wsgi $(INSTDIR)/wsgi/rpki.wsgi ${INSTALL} -m 644 settings.py ${SYSCONFDIR} - ${INSTALL} -m 644 -t $(INSTDIR)/media/img $(srcdir)/media/img/* deinstall uninstall: rm -rf $(INSTDIR) diff --git a/rpkid/portal-gui/apache.conf.in b/rpkid/portal-gui/apache.conf.in index 133d014a..61a4f0e4 100644 --- a/rpkid/portal-gui/apache.conf.in +++ b/rpkid/portal-gui/apache.conf.in @@ -25,8 +25,7 @@ Order deny,allow Allow from all </Directory> -Alias /media/ @INSTDIR@/media/ -Alias /site_media/ @INSTDIR@/media/ +Alias /static @INSTDIR@/static # redirect to the dashboard when someone hits the bare vhost RedirectMatch ^/$ /rpki/ diff --git a/rpkid/portal-gui/scripts/rpki-manage.in b/rpkid/portal-gui/scripts/rpki-manage.in index f9786898..fdd3ee3f 100644 --- a/rpkid/portal-gui/scripts/rpki-manage.in +++ b/rpkid/portal-gui/scripts/rpki-manage.in @@ -4,7 +4,7 @@ # $LANG is unset if [ -z "$LANG" ]; then echo '$LANG is unset, default to en_US.UTF-8' - exort LANG=en_US.UTF-8 + export LANG=en_US.UTF-8 fi 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 20973a0e..2e8e494f 100644 --- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py +++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py @@ -1,5 +1,4 @@ # Copyright (C) 2011 SPARTA, Inc. dba Cobham -# Anaportal-gui/scripts/rpkigui-rcynic.py # Copyright (C) 2012 SPARTA, Inc. a Parsons Company # # Permission to use, copy, modify, and distribute this software for any @@ -175,7 +174,7 @@ def process_cache(root, xml_file): inst.mtime = mtime try: obj = vs.obj # causes object to be lazily loaded - except rpki.POW._der.DerError, e: + except Exception, e: logger.warning('Caught %s while processing %s: %s' % ( type(e), vs.filename, e)) continue diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in index 0c939c28..7eed4aa7 100644 --- a/rpkid/portal-gui/settings.py.in +++ b/rpkid/portal-gui/settings.py.in @@ -106,4 +106,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.static" ) +# where to put static files +STATIC_ROOT = '/usr/local/share/rpki/static' + STATIC_URL = '/static/' |