X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=35a23ab2f21f4ba8d4ff00c685b86781157971fb;hb=a4e290e3e266fe7d27538af2b3f23ad7474aee48;hp=0b2064d8f4e66287b9cec61e540156b0d7a47569;hpb=6af57054f5a83b76e4008b81d559dc0abebd0717;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 0b2064d8..35a23ab2 100644
--- 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,43 @@ $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="credential_schema" type="string">
+          <name>Credential Schema</name>
+          <value>/etc/sfa/credential.xsd</value>
+          <description>The path to the default credential schema</description>
+        </variable>
+
+        <variable id="api_debug" type="boolean">
+          <name>Debug</name>
+          <value>false</value>
+          <description>Flag to turn debug on.</description>
+        </variable>
+
+        <variable id="session_key_path" type="string">
+            <name>User Session Keys Path </name>
+            <value>/var/lib/sfa/session_keys</value>
+            <description>Some services will peform operations on behalf of a user, but make
+            it look like the user is the one performing the operation. Doing this requires a 
+            valid key pair and credential for the user. This option defines the path where 
+            key pairs and credentials are generated and stored.
+            This functionality is used by the SFA web gui 
+            </description> 
+        </variable>
+      </variablelist>
+    </category>
+
     <!-- ======================================== -->
     <category id="sfa_registry">
       <name>Registry</name>
@@ -55,14 +90,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 +113,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>
@@ -132,7 +166,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>
@@ -195,6 +229,31 @@ $URL$
       </variablelist>
     </category>
 
+    <category id="sfa_flashpolicy">
+      <name>SFA Flash Policy</name>
+      <description>The settings that affect the flash policy server that will run
+      as part of this SFA instance.</description>
+
+      <variablelist>
+        <variable id="enabled" type="boolean">
+          <name>Enable Flash Policy Server</name>
+          <value>false</value>
+          <description>Allows this local SFA instance to run a
+          flash policy server.</description>
+        </variable>
+        <variable id="config_file" type="string">
+          <name>Flash policy config file</name>
+          <value>/etc/sfa/sfa_flashpolicy_config.xml</value>
+          <description>The path to where the flash policy config file can be reached.</description>
+        </variable>
+        <variable id="port" type="int">
+          <name>Flash policy port</name>
+          <value>843</value>
+          <description>The flash policy server port.</description>
+        </variable>
+      </variablelist>
+    </category>
+
   </variables>
 
   <comps>