Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa

[sfa.git] / config / default_config.xml

diff --git a/config/default_config.xml b/config/default_config.xml
index 0edfd48..99c5d37 100644 (file)
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,7 +33,7 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="aggregate_api_version" type="string">
+        <variable id="aggregate_api_version" type="int">
           <name>Aggregate Manager API Version</name>
           <value>1</value>
           <description>The Aggregate API version</description>
@@ -85,13 +85,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 +122,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 +151,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>
@@ -200,6 +179,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 +199,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>