Merge branch 'master' of ssh://git.onelab.eu/git/sfa

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 728fa88..ce5ec40 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -5,8 +5,6 @@ Default SFA configuration file
 
 Thierry Parmentelat 
 
-$Id$
-$URL$
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -14,6 +12,27 @@ $URL$
 <configuration>
   <variables>
 
+    <!-- ======================================== -->
+    <category id="sfa">
+      <name>General</name>
+      <description>Basic system variables.</description>
+
+      <variablelist>
+       <variable id="interface_hrn" type="string">
+         <name>Human readable name</name>
+         <value>plc</value>
+         <description>The human readable name for this interface.</description>
+       </variable>
+
+       <variable id="api_debug" type="boolean">
+         <name>Debug</name>
+         <value>false</value>
+         <description>Flag to turn debug on.</description>
+       </variable>
+
+      </variablelist>
+    </category>
+
     <!-- ======================================== -->
     <category id="sfa_registry">
       <name>Registry</name>
@@ -55,14 +74,7 @@ $URL$
          <description>The hrn of the registry's root auth.</description>
        </variable>
 
-       <variable id="level1_auth" type="string">
-         <name>Level1 Authority</name>
-         <value></value>
-         <description>The hrn of the registry's level1 auth (sub
-         authority). The full name of this interface (only secify if
-         this interface is a sub authority).</description>
-       </variable>
-      </variablelist>
+    </variablelist>
     </category>
 
     <!-- ======================================== -->
@@ -85,6 +97,12 @@ $URL$
          <description>The type of backend server for this
          aggregate. Some aggregates may not be myplc.</description>
        </variable>
+    
+    <variable id="rspec_schema" type="string">
+      <name>RSpec Schema</name>
+      <value>/etc/sfa/pl.rng</value>
+      <description>The path to the default schema</description>
+    </variable>
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
@@ -100,6 +118,42 @@ $URL$
        </variable>
       </variablelist>
 
+    </category>
+    <!-- ======================================== -->
+    <category id="sfa_geni_aggregate">
+      <name>GENI Aggregate</name>
+      <description>The settings that affect the geni aggregate manager that will run
+      as part of this SFA instance.</description>
+
+      <variablelist>
+       <variable id="enabled" type="boolean">
+         <name>Enable GENI Aggregate</name>
+         <value>true</value>
+         <description>Allows this local SFA instance to run as an
+         GENI aggregate manager.</description>
+       </variable>
+
+       <variable id="type" type="string">
+         <name>GENI Aggregate type</name>
+         <value>pl</value>
+         <description>The type of backend server for this
+         aggregate. Some aggregates may not be myplc.</description>
+       </variable>
+
+       <variable id="host" type="hostname">
+         <name>Hostname</name>
+         <value>localhost</value>
+         <description>The hostname where the aggregate is expected to
+         be found.</description>
+       </variable>
+
+       <variable id="port" type="int">
+         <name>Port number</name>
+         <value>12348</value>
+         <description>The port where the aggregate is to be found.</description>
+       </variable>
+      </variablelist>
+
     </category>
 
     <!-- ======================================== -->
@@ -132,7 +186,7 @@ $URL$
 
        <variable id="port" type="int">
          <name>Port number</name>
-         <value>12346</value>
+         <value>12347</value>
          <description>The port where the slice manager is to be found.</description>
        </variable>
       </variablelist>
@@ -174,7 +228,7 @@ $URL$
          <description>The host where the PLC database can be reached.</description>
        </variable>
 
-       <variable id="db_port" type="string">
+       <variable id="db_port" type="int">
          <name>Database port</name>
          <value>5432</value>
          <description>The port where the PLC database can be reached.</description>