Merge branch 'master' into thgeneric

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index ce5ec40..670d6f2 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,17 +18,49 @@ 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 id="generic_flavour" type="string">
+         <name>Generic Flavour</name>
+         <value>pl</value>
+         <description>This string refers to a class located in sfa.generic that describes 
+         which specific implementation needs to be used for api, manager and driver objects.
+         PlanetLab users do not need to change this setting.
+         </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="max_slice_renew" type="int">
+          <name>Max Slice Renew</name>
+          <value>60</value>
+          <description>Maximum amout of days a user can extend/renew their slices to</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>
@@ -118,42 +150,6 @@ Thierry Parmentelat
        </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>
 
     <!-- ======================================== -->
@@ -249,6 +245,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>