initial make (before make install) does not have DESTDIR set

[sfa.git] / geni-config-tty

diff --git a/geni-config-tty b/geni-config-tty
index 91735d6..dae6c6a 100755 (executable)
--- a/geni-config-tty
+++ b/geni-config-tty
@@ -41,7 +41,9 @@ all_variables   = ["GENI_REGISTRY_ROOT_AUTH",
                    "GENI_PLC_PORT",
                    "GENI_PLC_API_PATH"
                    ]
-usual_variables = ["GENI_PLC_USER",
+usual_variables = ["GENI_REGISTRY_ROOT_AUTH",
+                   "GENI_REGISTRY_LEVEL1_AUTH",
+                   "GENI_PLC_USER",
                    "GENI_PLC_PASSWORD",    
                    ]
 
@@ -250,7 +252,7 @@ def setup_server_key(config_dict):
     hrn_leaf = get_leaf(hrn)
     if not hrn_leaf:
         hrn_leaf = hrn
-    new_server_key = os.sep.join([path, auth_path, hrn_leaf]) + ".key"
+    new_server_key = os.sep.join([path, auth_path, hrn_leaf]) + ".pkey"
     old_server_key = os.sep.join([path, key])
     old_server_cert = os.sep.join([path, cert])