X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=499bd6e721e2153619af2ff054b379a172528629;hb=2d2a85edf02c635b592dfdb52c92dfa97b845f68;hp=f1bf78410dd8cc4e9a9d7490092d954050f3f003;hpb=43c4f89c59b5c977bf8ee77b7817c14dc6349bc3;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index f1bf7841..499bd6e7 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -3,7 +3,7 @@
 <!--
 Default SFA configuration file
 
-Thierry Parmentelat 
+Thierry Parmentelat
 
 -->
 
@@ -21,7 +21,7 @@ Thierry Parmentelat
         <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 
+          <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>
@@ -44,7 +44,7 @@ Thierry Parmentelat
           <value>0</value>
           <description>Logging level; 0=minimum, 1=info, 2=debug</description>
         </variable>
-    
+
         <variable id="max_slice_renew" type="int">
           <name>Max Slice Renew</name>
           <value>60</value>
@@ -55,11 +55,11 @@ Thierry Parmentelat
             <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 
+            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> 
+            This functionality is used by the SFA web GUI.
+            </description>
         </variable>
 
          <variable id="data_dir" type="string">
@@ -118,9 +118,10 @@ Thierry Parmentelat
       <variablelist>
 	<variable id="enabled" type="boolean">
 	  <name>Enable Slice Manager</name>
-	  <value>true</value>
+	  <value>false</value>
 	  <description>Allows this local SFA instance to run as a
-	  slice manager.</description>
+	  slice manager. Warning, this feature is not really supported
+	  any longer.</description>
 	</variable>
 
 	<variable id="host" type="hostname">
@@ -230,32 +231,6 @@ 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>
-
     <!-- ======================================== -->
     <category id="sfa_plc">
       <name></name>
@@ -300,13 +275,13 @@ Thierry Parmentelat
     <!-- ======================================== -->
     <category id="sfa_nova">
       <name>SFA Flash Policy</name>
-      <description>The settings that affect how SFA connects to 
+      <description>The settings that affect how SFA connects to
                    the Nova/EC2 API</description>
       <variablelist>
         <variable id="user" type="string">
           <name>Sfa nova user</name>
           <value>novaadmin</value>
-          <description>Account/context to use when performing 
+          <description>Account/context to use when performing
                        administrative nova operations</description>
         </variable>
         <variable id="api_url" type="string">