Merge branch 'master' into thgeneric

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 46e734e..670d6f2 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,6 +18,15 @@ Thierry Parmentelat
       <description>Basic system variables.</description>
 
       <variablelist>
       <description>Basic system variables.</description>
 
       <variablelist>

+       <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="interface_hrn" type="string">
           <name>Human readable name</name>
           <value>plc</value>
         <variable id="interface_hrn" type="string">
           <name>Human readable name</name>
           <value>plc</value>


@@ -36,8 +45,8 @@ Thierry Parmentelat
           <description>Flag to turn debug on.</description>
         </variable>
     
           <description>Flag to turn debug on.</description>
         </variable>
     

-        <variable id="slice_max_renew" type="boolean">
-          <name>Slice Max Renew</name>
+        <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>
           <value>60</value>
           <description>Maximum amout of days a user can extend/renew their slices to</description>
         </variable>


@@ -49,9 +58,10 @@ Thierry Parmentelat
             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.
             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 
+            This functionality is used by the SFA web GUI. 

             </description> 
         </variable>
             </description> 
         </variable>

+

       </variablelist>
     </category>
 
       </variablelist>
     </category>