X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config%2Fdefault_config.xml;h=e074865ef7d2a57f73d9c3265fc1854a4b9ab777;hb=0d8c502d5ede80349764103f580c4000a8fce97a;hp=6d052fc97ee6cfeba935ce0bcb1af1e65fa625cc;hpb=99374374f38fb62e54a6c284eec6b06c1c53dff7;p=sfa.git

diff --git a/config/default_config.xml b/config/default_config.xml
index 6d052fc9..e074865e 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,12 +33,6 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="am_api_version" type="string">
-          <name>Aggregate Manager API Version</name>
-          <value>1</value>
-          <description>The Aggregate API version</description>
-        </variable>
-
         <variable id="credential_schema" type="string">
           <name>Credential Schema</name>
           <value>/etc/sfa/credential.xsd</value>
@@ -85,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>
@@ -129,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>
@@ -165,13 +145,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>
@@ -190,6 +163,7 @@ Thierry Parmentelat
 	  <value>12346</value>
 	  <description>The port where the aggregate is to be found.</description>
 	</variable>
+
       </variablelist>
 
     </category>
@@ -200,6 +174,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>
@@ -214,7 +194,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>