diff options
| author | Michael Elkins <melkins@tislabs.com> | 2015-03-23 18:04:06 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2015-03-23 18:04:06 +0000 |
| commit | c6960c82cba72a544d29c807dd5ec2f4c1819458 (patch) | |
| tree | be198ba5a11883c7b8a35edc43580c780506071e | |
| parent | f270a0a52239a0f2a316340f2763b5a8debc100c (diff) | |
add `download-directory' configuration option in [web_portal] to specify the directory to use when downloading the routeviews.org dump.
changed default value to /var/tmp
see #759
svn path=/trunk/; revision=6070
| -rw-r--r-- | ca/rpki-confgen.xml | 8 | ||||
| -rw-r--r-- | rpki/gui/default_settings.py | 2 | ||||
| -rw-r--r-- | rpki/gui/routeview/util.py | 3 | ||||
| -rw-r--r-- | rpki/gui/script_util.py | 1 |
4 files changed, 13 insertions, 1 deletions
diff --git a/ca/rpki-confgen.xml b/ca/rpki-confgen.xml index e0ed273a..ac36d3db 100644 --- a/ca/rpki-confgen.xml +++ b/ca/rpki-confgen.xml @@ -861,6 +861,14 @@ </doc> </option> + <option name = "download-directory" + value = "/var/tmp"> + <doc> + A directory large enough to hold the RouteViews.org routing table dump + fetched by the rpkigui-import-routes script. + </doc> + </option> + </section> <section name = "autoconf"> diff --git a/rpki/gui/default_settings.py b/rpki/gui/default_settings.py index 2f1a08ed..02987bb8 100644 --- a/rpki/gui/default_settings.py +++ b/rpki/gui/default_settings.py @@ -129,6 +129,8 @@ def get_allowed_hosts(): ALLOWED_HOSTS = get_allowed_hosts() +DOWNLOAD_DIRECTORY = rpki_config.get('download-directory', '/var/tmp') + # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', diff --git a/rpki/gui/routeview/util.py b/rpki/gui/routeview/util.py index 54d50f24..c84d1c6f 100644 --- a/rpki/gui/routeview/util.py +++ b/rpki/gui/routeview/util.py @@ -25,6 +25,7 @@ import urlparse from urllib import urlretrieve, unquote from django.db import transaction, connection +from django.conf import settings from rpki.resource_set import resource_range_ipv4, resource_range_ipv6 from rpki.exceptions import BadIPResource @@ -187,7 +188,7 @@ def import_routeviews_dump(filename=DEFAULT_URL, filetype='auto'): #get filename from the basename of the URL u = urlparse.urlparse(filename) bname = os.path.basename(unquote(u.path)) - tmpname = os.path.join('/tmp', bname) + tmpname = os.path.join(settings.DOWNLOAD_DIRECTORY, bname) logger.info("Downloading %s to %s", filename, tmpname) if os.path.exists(tmpname): diff --git a/rpki/gui/script_util.py b/rpki/gui/script_util.py index fb15403d..43a53bc6 100644 --- a/rpki/gui/script_util.py +++ b/rpki/gui/script_util.py @@ -43,6 +43,7 @@ def setup(): } }, MIDDLEWARE_CLASSES = (), + DOWNLOAD_DIRECTORY = cfg.get('download-directory', '/var/tmp'), ) if django.VERSION >= (1, 7): from django.apps import apps |