X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=b0e54b707dce7464f2663fad9b8cb45732643ab4;hb=5f2aa40c08b2c7cb49d17ecee6a877aadba0d210;hp=5214886ed3b1d647ff26cec7de430c4ecf8f2329;hpb=fa0ef7c98da2ab71bd4d7339055aaa86d9f68aaf;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 5214886..b0e54b7 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -7,6 +7,7 @@ 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">
@@ -160,6 +161,22 @@ $Id$
       </variablelist>
     </category>
 
+    <category id="plc_hosts">
+      <name>/etc/hosts</name>
+      <description>MyPLC can setup /etc/hosts with the hostnames and
+      IP addresses specified for *_NAME and *_IP, or look up the IP
+      addresses if they are not specified in this configuration.
+      </description>
+
+      <variablelist>
+        <variable id="enabled" type="boolean">
+          <name>Enable /etc/hosts configuration</name>
+          <value>true</value>
+          <description>Let PLC manage /etc/hosts</description>
+        </variable>
+      </variablelist>
+    </category>
+
     <category id="plc_mail">
       <name>Mail</name>
       <description>Many maintenance scripts, as well as the API and
@@ -606,6 +623,32 @@ $Id$
           <description>The password to use when accessing the
           database, Monitor user account in the local PLC.</description>
         </variable>
+
+	    <variable id="ssl_key" type="file">
+		  <name>SSL Private Key</name>
+		  <value>/etc/planetlab/monitor_ssl.key</value>
+		  <description>The SSL private key to use for encrypting HTTPS
+		  traffic.</description>
+		</variable>
+
+		<variable id="ssl_crt" type="file">
+		  <name>SSL Public Certificate</name>
+		  <value>/etc/planetlab/monitor_ssl.crt</value>
+		  <description>The corresponding SSL public certificate for
+		  the HTTP server. By default, this certificate is
+		  self-signed. You may replace the certificate later with one
+		  signed by a root CA.</description>
+		</variable>
+
+		<variable id="ca_ssl_crt" type="file">
+		  <name>Root CA SSL Public Certificate</name>
+		  <value>/etc/planetlab/monitor_ca_ssl.crt</value>
+		  <description>The certificate of the root CA, if any, that
+		  signed your server certificate. If your server certificate is
+		  self-signed, then this file is the same as your server
+		  certificate.</description>
+		</variable>
+
       </variablelist>
     </category>
     <category id="plc_rt">
@@ -627,11 +670,16 @@ $Id$
           <value/>
           <description>The IP address of the RT server.</description>
         </variable>
+        <variable id="cc_address" type="email">
+          <name>CC Email Address</name>
+          <value>root+cclist@localhost.localdomain</value>
+          <description>All messages to and from PLCRT will be copied to this address.</description>
+        </variable>
         <variable id="web_user" type="string">
           <name>root</name>
           <value>root</value>
           <description>Username of a privileged user in RT who can create
-		  tickets in the queue named PLC_MONITOR_RT_QUEUE.</description>
+		  tickets for any RT Queue.</description>
         </variable>
         <variable id="web_password" type="password">
           <name>password</name>