X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=a97ed77c3eb5e29bde4b933f3a8f07d25673ae91;hb=3772cc2c2d6908a83fe6d22e274cb85dd2e08e8f;hp=bfaf7883316b7cf191ea0559b0d6e392a32aecb5;hpb=7c356a06be0b54206e85917c8339d585ae423eec;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index bfaf788..a97ed77 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -6,8 +6,6 @@ Default PLC configuration file
 Mark Huang <mlhuang@cs.princeton.edu>
 Copyright (C) 2006 The Trustees of Princeton University
 
-$Id$
-$URL$
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -632,6 +630,18 @@ $URL$
       </variablelist>
     </category>
 
+    <category id="plc_ratelimit">
+      <name>Planetlab Ratelimit Settings</name>
+      <description>Planetlab Ratelimit Settings</description>
+      <variablelist>
+        <variable id="enabled" type="bolean">
+          <name>Enable Ratelimit</name>
+          <value>false</value>
+          <description>Enable Ratelimit for sites</description>
+        </variable>
+      </variablelist>
+    </category>
+
     <category id="plc_omf">
       <name>Planetlab - OMF Integration</name>
       <description>Planetlab - OMF integration</description>
@@ -734,6 +744,21 @@ $URL$
           <value>support</value>
           <description>All messages from Monitor will be copied to this address.</description>
         </variable>
+        <variable id="dbhost" type="hostname">
+          <name>Database Hostname</name>
+          <value>localhost</value>
+          <description>The hostname for the monitor database.</description>
+        </variable>
+        <variable id="dbuser" type="string">
+          <name>Database User</name>
+          <value>monitoruser</value>
+          <description>The username for connecting to the monitor database.</description>
+        </variable>
+        <variable id="dbname" type="string">
+          <name>Database Name</name>
+          <value>monitor</value>
+          <description>Name of monitor database.</description>
+        </variable>
         <variable id="dbpassword" type="password">
           <name>Database Password</name>
           <value></value>
@@ -810,6 +835,7 @@ $URL$
         </variable>
       </variablelist>
     </category>
+
     <category id="myslice">
       <name>MySlice</name>
       <description>MySlice configuration parameters</description>
@@ -831,6 +857,18 @@ $URL$
 	</variable>
       </variablelist>
     </category>
+
+    <category id="plc_vsys">
+      <name>vsys</name>
+      <description>Default values for the vsys tag</description>
+      <variablelist>
+	<variable id="defaults" type="string">
+	  <name>vsys tags set by default</name>
+	  <value> </value>
+	  <description>Comma-separated list of vsys script names that all newly created slices will have as their vsys tags. For older slices, see the check-vsys-defaults.py script as part of the myplc package</description>
+	</variable>
+      </variablelist>
+    </category>
   </variables>
 
   <comps>