diff options
author | Michael Elkins <melkins@tislabs.com> | 2011-01-24 21:09:36 +0000 |
---|---|---|
committer | Michael Elkins <melkins@tislabs.com> | 2011-01-24 21:09:36 +0000 |
commit | 6f9a00b15fe27c894a18e4daa5b01448589c2fe4 (patch) | |
tree | 6328d12712ccd130913be87dacd92ac502c93106 /portal-gui/scripts/load_csv.py | |
parent | 68dfa47423d9732991ee9eacc820d38f44507581 (diff) |
move portal-gui django app to $top/rpkid/rpki/gui
change dashboard url to /rpki/
put myrpki cli path and confdir into settings.py rather than generating glue.py at build time
don't use the old myrpki images on the dashboard
no longer need to include the portal-gui python module in sys.path since it is installed in site-packages
svn path=/buildtools/subst-vars.py; revision=3646
Diffstat (limited to 'portal-gui/scripts/load_csv.py')
-rwxr-xr-x | portal-gui/scripts/load_csv.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/portal-gui/scripts/load_csv.py b/portal-gui/scripts/load_csv.py index 29938b2d..f4738539 100755 --- a/portal-gui/scripts/load_csv.py +++ b/portal-gui/scripts/load_csv.py @@ -25,8 +25,7 @@ # import sys, os -sys.path.append('@INSTDIR@') -os.environ['DJANGO_SETTINGS_MODULE'] = 'rpkigui.settings' +os.environ['DJANGO_SETTINGS_MODULE'] = 'rpki.gui.settings' import csv import socket # for socket.error @@ -36,8 +35,8 @@ import rpki.resource_set import rpki.ipaddrs from rpki.myrpki import csv_reader -from rpkigui.myrpki import models -from rpkigui.myrpki.views import add_roa_requests +from rpki.gui.app import models +from rpki.gui.app.views import add_roa_requests cfg_file = os.getenv("RPKI_CONF", "rpki.conf") cfg = rpki.config.parser(cfg_file, "myrpki") |