X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc_config.xml;h=567babe5c545b1524ee55edfe9e494209cc20116;hb=057d88bea459d91276dbb58e469eedc06435fc07;hp=3863d990a288f327d1a538452748c9ed9f7ccfe5;hpb=737199fc5dfb3ebeeca3e18cbbc3d416724a101d;p=myplc.git

diff --git a/plc_config.xml b/plc_config.xml
index 3863d99..567babe 100644
--- a/plc_config.xml
+++ b/plc_config.xml
@@ -6,7 +6,7 @@ Default PLC configuration file
 Mark Huang <mlhuang@cs.princeton.edu>
 Copyright (C) 2006 The Trustees of Princeton University
 
-$Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
+$Id: plc_config.xml,v 1.16 2006/10/27 20:26:49 mlhuang Exp $
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -290,7 +290,7 @@ $Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
 
 	<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>
 
@@ -346,13 +346,9 @@ $Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
 
 	<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">
@@ -634,9 +630,6 @@ $Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
 	<!-- 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>
@@ -650,7 +643,8 @@ $Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
 	     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>	
@@ -660,6 +654,7 @@ $Id: plc_config.xml,v 1.14 2006/06/23 20:31:09 mlhuang Exp $
 	<packagereq type="mandatory">mod_python</packagereq>
 
 	<!-- API server uses a few non-standard packages -->
+	<packagereq type="mandatory">PLCAPI</packagereq>
 	<packagereq type="mandatory">PyXML</packagereq>
 	<packagereq type="mandatory">PlanetLabAuth</packagereq>