X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=e2204b8f5960d24b7524f38da1c1e6fe81980986;hb=00ce026d1b2662f9579ed5b2a5589c670e000285;hp=04fac35d654ce30ecfb1ec8e2e92f6f5ceea2b9e;hpb=ab069cba026117f003edacbe02830a98517782d8;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 04fac35..e2204b8 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">
@@ -74,20 +75,6 @@ $Id$
 	     be downloaded, or its contents replaced by a file upload,
 	     but the actual <value> shouldn't need to be changed.  -->
 
-	<variable id="root_ssh_key_pub" type="file">
-	  <name>Root SSH Public Key</name>
-	  <value>/etc/planetlab/root_ssh_key.pub</value>
-	  <description>The SSH public key used to access the root
-	  account on your nodes.</description>
-	</variable>
-
-	<variable id="root_ssh_key" type="file">
-	  <name>Root SSH Private Key</name>
-	  <value>/etc/planetlab/root_ssh_key.rsa</value>
-	  <description>The SSH private key used to access the root
-	  account on your nodes.</description>
-	</variable>
-
 	<variable id="debug_ssh_key_pub" type="file">
 	  <name>Debug SSH Public Key</name>
 	  <value>/etc/planetlab/debug_ssh_key.pub</value>
@@ -606,6 +593,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,17 +640,27 @@ $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>localhost.localdomain</value>
+          <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>
           <value>password</value>
           <description>Password for RT web user.</description>
         </variable>
+        <variable id="dbpassword" type="password">
+          <name>Database Password</name>
+          <value></value>
+          <description>Password to use when accessing the RT database.</description>
+        </variable>
       </variablelist>
     </category>
   </variables>