3 files changed, 7 insertions, 7 deletions
diff --git a/portal-gui/scripts/adduser.py b/portal-gui/scripts/adduser.py
index b42e4687..27e73ed7 100755
--- a/portal-gui/scripts/adduser.py
+++ b/portal-gui/scripts/adduser.py
@@ -96,8 +96,8 @@ if __name__ == '__main__':
 	os.mkdir(myrpki_dir)
     os.chown(myrpki_dir, web_uid, -1)
 
-    # create stuf myrpki.conf enough to fool portal-gui
-    myrpki_conf = myrpki_dir + '/myrpki.conf'
+    # create stuf rpki.conf enough to fool portal-gui
+    myrpki_conf = myrpki_dir + '/rpki.conf'
     if not os.path.exists(myrpki_conf):
 	print 'creating ', myrpki_conf
 	with open(myrpki_conf, 'w') as f:
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"))
diff --git a/portal-gui/scripts/load_csv.py b/portal-gui/scripts/load_csv.py
index 61ec15b6..476539b9 100755
--- a/portal-gui/scripts/load_csv.py
+++ b/portal-gui/scripts/load_csv.py
@@ -20,7 +20,7 @@
 # Primarly useful for the initial load, as the GUI does not sync changes
 # made directly to the csv files back into the database.
 #
-# This script should be run from the directory containing the myrpki.conf
+# This script should be run from the directory containing the rpki.conf
 # for the handle you are loading data
 #
 
@@ -36,7 +36,7 @@ from rpki.myrpki import csv_reader
 from rpkigui.myrpki import models
 from rpkigui.myrpki.views import add_roa_requests
 
-cfg_file = os.getenv("MYRPKI_CONF", "myrpki.conf")
+cfg_file = os.getenv("RPKI_CONF", "rpki.conf")
 cfg = rpki.config.parser(cfg_file, "myrpki")
 handle = cfg.get('handle')
 asn_csv = cfg.get('asn_csv')