dumps and cleans the drupal database as well

[myplc.git] / doc / plc_variables.xml

diff --git a/doc/plc_variables.xml b/doc/plc_variables.xml
index e0d7806..d4a9218 100644 (file)
--- a/doc/plc_variables.xml
+++ b/doc/plc_variables.xml
@@ -116,81 +116,6 @@
          account on your nodes.</para>
     </listitem>
   </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_NAMESPACE</term>
-    <listitem>
-      <para>
-                 Type: ip</para>
-      <para>
-                 Default: test</para>
-      <para>The namespace of your MA/SA. This should be a
-         globally unique value assigned by PlanetLab
-         Central.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_SSL_KEY</term>
-    <listitem>
-      <para>
-                 Type: file</para>
-      <para>
-                 Default: /etc/planetlab/ma_sa_ssl.key</para>
-      <para>The SSL private key used for signing documents
-         with the signature of your MA/SA. If non-existent, one will
-         be generated.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_SSL_CRT</term>
-    <listitem>
-      <para>
-                 Type: file</para>
-      <para>
-                 Default: /etc/planetlab/ma_sa_ssl.crt</para>
-      <para>The corresponding SSL public certificate. By
-         default, this certificate is self-signed. You may replace
-         the certificate later with one signed by the PLC root
-         CA.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_CA_SSL_CRT</term>
-    <listitem>
-      <para>
-                 Type: file</para>
-      <para>
-                 Default: /etc/planetlab/ma_sa_ca_ssl.crt</para>
-      <para>If applicable, the certificate of the PLC root
-         CA. If your MA/SA certificate is self-signed, then this file
-         is the same as your MA/SA certificate.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_CA_SSL_KEY_PUB</term>
-    <listitem>
-      <para>
-                 Type: file</para>
-      <para>
-                 Default: /etc/planetlab/ma_sa_ca_ssl.pub</para>
-      <para>If applicable, the public key of the PLC root
-         CA. If your MA/SA certificate is self-signed, then this file
-         is the same as your MA/SA public key.</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>PLC_MA_SA_API_CRT</term>
-    <listitem>
-      <para>
-                 Type: file</para>
-      <para>
-                 Default: /etc/planetlab/ma_sa_api.xml</para>
-      <para>The API Certificate is your MA/SA public key
-         embedded in a digitally signed XML document. By default,
-         this document is self-signed. You may replace this
-         certificate later with one signed by the PLC root
-         CA.</para>
-    </listitem>
-  </varlistentry>
   <varlistentry>
     <term>PLC_NET_DNS1</term>
     <listitem>
@@ -335,7 +260,7 @@
       <para>
                  Type: string</para>
       <para>
-                 Default: planetlab3</para>
+                 Default: planetlab4</para>
       <para>The name of the database to access.</para>
     </listitem>
   </varlistentry>
@@ -412,13 +337,9 @@
       <para>
                  Type: int</para>
       <para>
-                 Default: 80</para>
+                 Default: 443</para>
       <para>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.</para>
+         should be accessed.</para>
     </listitem>
   </varlistentry>
   <varlistentry>