X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=9156cb32a6b991b21e8ccf3e447c187c01daea62;hb=b6de9285a970eccb9658a0078c49f76fb11af7cd;hp=e633a60b4281de78c0decd1bd22c41d1d1c47dc2;hpb=0dc36703e0e611113d310d2b2a8e51210576bcc5;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index e633a60b..9156cb32 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -18,6 +18,15 @@ Thierry Parmentelat
       <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>
@@ -53,15 +62,6 @@ Thierry Parmentelat
             </description> 
         </variable>
 
-	<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>
-
       </variablelist>
     </category>
 
@@ -79,13 +79,6 @@ Thierry Parmentelat
 	  registry.</description>
 	</variable>
 
-	<variable id="type" type="string">
-	  <name>Registry type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  registry. Some registries may not be myplc.</description>
-	</variable>
-
 	<variable id="host" type="hostname">
 	  <name>Hostname</name>
 	  <value>localhost</value>
@@ -123,13 +116,6 @@ Thierry Parmentelat
 	  slice manager.</description>
 	</variable>
 
-	<variable id="type" type="string">
-	  <name>Slice Manager type</name>
-	  <value>pl</value>
-	  <description>The type of backend server for this
-	  slice manager. Not all slice managers are myplc.</description>
-	</variable>
-
 	<variable id="host" type="hostname">
 	  <name>Hostname</name>
 	  <value>localhost</value>
@@ -142,6 +128,14 @@ Thierry Parmentelat
 	  <value>12347</value>
 	  <description>The port where the slice manager is to be found.</description>
 	</variable>
+
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>false</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
+
       </variablelist>
     </category>
 
@@ -159,19 +153,6 @@ Thierry Parmentelat
 	  aggregate manager.</description>
 	</variable>
 
-	<variable id="type" type="string">
-	  <name>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="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>
 	  <value>localhost</value>
@@ -184,6 +165,14 @@ Thierry Parmentelat
 	  <value>12346</value>
 	  <description>The port where the aggregate is to be found.</description>
 	</variable>
+
+	<variable id="caching" type="boolean">
+	  <name>Cache advertisement rspec</name>
+	  <value>true</value>
+	  <description>Enable caching of the global advertisement, as
+	  returned by ListResources without a slice argument. </description>
+	  </variable>
+
       </variablelist>
 
     </category>
@@ -194,6 +183,12 @@ Thierry Parmentelat
       <description>The settings that tell this SFA instance where to find its database. You can essentially leave this as-is unless you plan on hosting your data on some other box.</description>
 
       <variablelist>
+	<variable id="enabled" type="boolean">
+	  <name>Enabled</name>
+	  <value>true</value>
+	  <description>Enable the database server on this machine.</description>
+	</variable>
+
 	<variable id="host" type="hostname">
 	  <name>Database host</name>
 	  <value>localhost</value>
@@ -208,7 +203,7 @@ Thierry Parmentelat
 
 	<variable id="user" type="string">
 	  <name>Database user</name>
-	  <value>pgsqluser</value>
+	  <value>sfadbuser</value>
 	  <description>When SFA gets co-hosted with a myplc, this should match the PLC config.</description>
 	</variable>