From f667aeb2a42af39038fb10044405a6c02cc14531 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 20 Jan 2011 20:48:56 +0000 Subject: UNTESTED changes to port-gui to match myrpki.conf => rpki.conf changes into line with the other Python code portal-gui needs a bit more work to bring its autoconf into line with the other code, which may include some source tree reorganizations. svn path=/portal-gui/Makefile.in; revision=3621 --- portal-gui/scripts/list_resources.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'portal-gui/scripts/list_resources.py') diff --git a/portal-gui/scripts/list_resources.py b/portal-gui/scripts/list_resources.py index 180a9202..f7abf3d2 100755 --- a/portal-gui/scripts/list_resources.py +++ b/portal-gui/scripts/list_resources.py @@ -20,7 +20,7 @@ # portal-gui's sqlite database. It asks rpkid for the list of received # resources, and the handles of any children. # -# This script should be run in the directory containing the myrpki.conf +# This script should be run in the directory containing the rpki.conf # for the handle that is self-hosting rpkid. # # Exit values: @@ -50,9 +50,9 @@ verbose = False version = '$Id$' def query_rpkid(): - """Fetch our received resources from the local rpkid using the myrpki.conf + """Fetch our received resources from the local rpkid using the rpki.conf in the current directory.""" - cfg_file = os.getenv("MYRPKI_CONF", "myrpki.conf") + cfg_file = os.getenv("RPKI_CONF", "rpki.conf") cfg = rpki.config.parser(cfg_file, "myrpki") bpki_servers = CA(cfg_file, cfg.get("bpki_servers_directory")) rpkid_base = "http://%s:%s/" % (cfg.get("rpkid_server_host"), cfg.get("rpkid_server_port")) -- cgit v1.2.3