added root_auth and level1_auth registry variables to config

diff --git a/geni/util/geni_config b/geni/util/geni_config
index e70fe4a..87c0032 100644 (file)
--- a/geni/util/geni_config
+++ b/geni/util/geni_config
@@ -3,26 +3,7 @@ GENI_BASE_DIR="/usr/share/geniwrapper/"
 
 # HRN
 # Human readable name for the interfaces
-GENI_INTERFACE_HRN="planetlab.us"   
-
-
-## Aggregate Configuration
-#
-# Enable aggregate inteface
-# Enable the aggregate inteface.   
-GENI_AGGREGATE_ENABLED=1
-
-# Hostname
-# The fully qualified hostname of the aggregate server  
-GENI_AGGREGATE_HOSTNAME="localhost"
-
-# IP
-# Geni aggregate ip address   
-GENI_AGGREGATE_IP="127.0.0.1"
-
-# Port
-# Geni aggregate server port
-GENI_AGGREGATE_PORT=12346
+GENI_INTERFACE_HRN="plc"   
 
 
 # Registry Configuration
@@ -31,6 +12,14 @@ GENI_AGGREGATE_PORT=12346
 # Enable the registry interface 
 GENI_REGISTRY_ENABLE=1
 
+# Root Auth
+# The hrn of the registry's root auth
+GENI_REGISTRY_ROOT_AUTH="plc"
+
+# Level1 Auth
+# The hrn of the registry's level1 auth
+GENI_REGISTRY_LEVEL1_AUTH=""
+
 # Hostname
 # The fully qualified hostname of the registry server
 GENI_REGISTRY_HOSTNAME="localhost"
@@ -43,6 +32,25 @@ GENI_REGISTRY_IP="127.0.0.1"
 # Geni registry port
 GENI_REGISTRY_PORT=12345
 
+
+## Aggregate Configuration
+##
+## Enable aggregate inteface
+## Enable the aggregate inteface.
+GENI_AGGREGATE_ENABLED=1
+#
+## Hostname
+## The fully qualified hostname of the aggregate server
+GENI_AGGREGATE_HOSTNAME="localhost"
+#
+## IP
+## Geni aggregate ip address
+GENI_AGGREGATE_IP="127.0.0.1"
+#
+## Port
+## Geni aggregate server port
+GENI_AGGREGATE_PORT=12346
+
 # Slice Manager Configuration
 #
 # Enabled