Mark Huang <mlhuang@cs.princeton.edu>
Copyright (C) 2006 The Trustees of Princeton University
-$Id: plc_config.xml,v 1.12 2006/04/28 20:15:00 mlhuang Exp $
+$Id: plc_config.xml,v 1.17 2006/11/10 19:03:48 mlhuang Exp $
-->
<!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
<variable id="name" type="string">
<name>Database Name</name>
- <value>planetlab3</value>
+ <value>planetlab4</value>
<description>The name of the database to access.</description>
</variable>
<variable id="port" type="int">
<name>Port</name>
- <value>80</value>
+ <value>443</value>
<description>The TCP port number through which the API
- should be accessed. Warning: SSL (port 443) access is not
- fully supported by the website code yet. We recommend that
- port 80 be used for now and that the API server either run
- on the same machine as the web server, or that they both be
- on a secure wired network.</description>
+ should be accessed.</description>
</variable>
<variable id="path" type="string">
be downloaded, or its contents replaced by a file upload,
but the actual <value> shouldn't need to be changed. -->
- <variable id="ssl_crt" type="file">
- <name>SSL Certificate</name>
- <value>/etc/planetlab/api_ssl.crt</value>
- <description>The signed SSL certificate to use for HTTPS
- access. If not specified or non-existent, a self-signed
- certificate will be generated.</description>
- </variable>
-
<variable id="ssl_key" type="file">
- <name>SSL Key</name>
+ <name>SSL Private Key</name>
<value>/etc/planetlab/api_ssl.key</value>
- <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
+ <description>The SSL private key to use for encrypting HTTPS
+ traffic. If non-existent, one will be
generated.</description>
</variable>
- <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 id="ssl_crt" type="file">
+ <name>SSL Public Certificate</name>
+ <value>/etc/planetlab/api_ssl.crt</value>
+ <description>The corresponding SSL public certificate. 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/api_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>
be downloaded, or its contents replaced by a file upload,
but the actual <value> shouldn't need to be changed. -->
+ <variable id="ssl_key" type="file">
+ <name>SSL Private Key</name>
+ <value>/etc/planetlab/www_ssl.key</value>
+ <description>The SSL private key to use for encrypting HTTPS
+ traffic. If non-existent, one will be
+ generated.</description>
+ </variable>
+
<variable id="ssl_crt" type="file">
- <name>SSL Certificate</name>
+ <name>SSL Public Certificate</name>
<value>/etc/planetlab/www_ssl.crt</value>
- <description>The signed SSL certificate to use for HTTPS
- access. If not specified or non-existent, a self-signed
- certificate will be generated.</description>
+ <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="ssl_key" type="file">
- <name>SSL Key</name>
- <value>/etc/planetlab/www_ssl.key</value>
- <description>The corresponding SSL private key. If not
- specified or non-existent, one will be
- generated.</description>
+ <variable id="ca_ssl_crt" type="file">
+ <name>Root CA SSL Public Certificate</name>
+ <value>/etc/planetlab/www_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>
be downloaded, or its contents replaced by a file upload,
but the actual <value> shouldn't need to be changed. -->
- <variable id="ssl_crt" type="binary">
- <name>SSL Certificate</name>
+ <variable id="ssl_key" type="file">
+ <name>SSL Private Key</name>
+ <value>/etc/planetlab/boot_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/boot_ssl.crt</value>
- <description>The signed SSL certificate to use for HTTPS
- access. If not specified, or non-existent a self-signed
- certificate will be generated.</description>
+ <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="ssl_key" type="binary">
- <name>SSL Key</name>
- <value>/etc/planetlab/boot_ssl.key</value>
- <description>The corresponding SSL private key. If not
- specified or non-existent, one will be
- generated.</description>
+ <variable id="ca_ssl_crt" type="file">
+ <name>Root CA SSL Public Certificate</name>
+ <value>/etc/planetlab/boot_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>
<!-- Almost all scripts are written in Python -->
<packagereq type="mandatory">python</packagereq>
- <!-- For various Python scripts that access the API -->
- <packagereq type="mandatory">plcapilib</packagereq>
-
<!-- Database server -->
<packagereq type="mandatory">postgresql</packagereq>
<packagereq type="mandatory">postgresql-server</packagereq>
access the DB directly. -->
<packagereq type="mandatory">php</packagereq>
<packagereq type="mandatory">php-pgsql</packagereq>
- <packagereq type="mandatory">php-xmlrpc</packagereq>
+ <!-- PLCAPI replaces php-xmlrpc -->
+ <!-- <packagereq type="mandatory">php-xmlrpc</packagereq> -->
<!-- Need GD for ImageCreate(), etc. -->
<packagereq type="mandatory">gd</packagereq>
<packagereq type="mandatory">mod_python</packagereq>
<!-- API server uses a few non-standard packages -->
+ <packagereq type="mandatory">PLCAPI</packagereq>
<packagereq type="mandatory">PyXML</packagereq>
<!-- API server uses SSL to sign tickets -->