From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 28 Mar 2006 20:49:06 +0000 (+0000)
Subject: - fix descriptions of SSL private keys
X-Git-Tag: myplc-0_4-rc1~124
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9d2a2347afc198d02f4e0a8718f625665f7b0dcd;p=myplc.git

- fix descriptions of SSL private keys
- warn that the slice prefix should not be changed at all
- remove plc_api_ssl_ticket_key_*, just use the web server
  private/public key for signing tickets
---

diff --git a/plc_config.xml b/plc_config.xml
index 3a2ca3c..5d494a0 100644
--- a/plc_config.xml
+++ b/plc_config.xml
@@ -25,7 +25,7 @@
 	  <description>The abbreviated name of this PLC
 	  installation. It is used as the prefix for system slices
 	  (e.g., pl_conf). Warning: Currently, this variable should
-	  not be changed once set.</description>
+	  not be changed.</description>
 	</variable>
 
 	<variable id="root_user" type="password">
@@ -285,23 +285,18 @@
 	<variable id="ssl_key" type="file">
 	  <name>SSL Key</name>
 	  <value>/etc/planetlab/api_ssl.key</value>
-	  <description>The corresponding SSL private key. If not
-	  specified or non-existent, a self-signed certificate will be
+	  <description>The corresponding SSL private key used for
+	  signing the certificate, and for signing slice tickets. If
+	  not specified or non-existent, one will be
 	  generated.</description>
 	</variable>
 
-	<variable id="ticket_key" type="file">
-	  <name>Slice Ticket Private Key</name>
-	  <value>/etc/planetlab/slice-ticket-key-nopass.pem</value>
-	  <description>The private PEM key file used to sign slice
-	  tickets.</description>
-	</variable>
-
-	<variable id="ticket_key_pub" type="file">
-	  <name>Slice Ticket Public Key</name>
-	  <value>/etc/planetlab/slice-ticket-key-public.pem</value>
-	  <description>The public PEM key file used to verify signed
-	  slice tickets.</description>
+	<variable id="ssl_key_pub" type="file">
+	  <name>SSL Key</name>
+	  <value>/etc/planetlab/api_ssl.pub</value>
+	  <description>The corresponding SSL public key. If not
+	  specified or non-existent, one will be
+	  generated.</description>
 	</variable>
       </variablelist>
     </category>
@@ -366,7 +361,7 @@
 	  <name>SSL Key</name>
 	  <value>/etc/planetlab/www_ssl.key</value>
 	  <description>The corresponding SSL private key. If not
-	  specified or non-existent, a self-signed certificate will be
+	  specified or non-existent, one will be
 	  generated.</description>
 	</variable>
       </variablelist>
@@ -430,7 +425,7 @@
 	  <name>SSL Key</name>
 	  <value>/etc/planetlab/boot_ssl.key</value>
 	  <description>The corresponding SSL private key. If not
-	  specified or non-existent, a self-signed certificate will be
+	  specified or non-existent, one will be
 	  generated.</description>
 	</variable>
       </variablelist>