Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 899d173..3eecf98 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,24 +18,34 @@ Thierry Parmentelat
       <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.rng</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="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>
 
@@ -255,6 +265,31 @@ Thierry Parmentelat
       </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>