allow db port to be overridden during build bootstrap

diff --git a/bootstrap.xml b/bootstrap.xml
index 0016bf9..b88e816 100644 (file)
--- a/bootstrap.xml
+++ b/bootstrap.xml
@@ -3,12 +3,20 @@
 
 <configuration>
 
-  <!-- This overlay configuration file changes the web, API, and boot
-       server ports to (hopefully unused) ports so that the system can
-       be bootstrapped on a build machine that may itself be running a
-       web server. -->
+  <!-- This overlay configuration file changes the DB, web, API, and
+       boot server ports to (hopefully unused) ports so that the
+       system can be bootstrapped on a build machine that may itself
+       be running such servers. -->
 
   <variables>
+    <category id="plc_db">
+      <variablelist>
+       <variable id="port" type="int">
+         <value>15432</value>
+       </variable>
+      </variablelist>
+    </category>
+
     <category id="plc_api">
       <variablelist>
        <variable id="port" type="int">

diff --git a/plc_config.xml b/plc_config.xml
index dba383b..288ae4d 100644 (file)
--- a/plc_config.xml
+++ b/plc_config.xml
@@ -176,6 +176,13 @@
          reachable by the rest of your installation.</description>
        </variable>
 
+       <variable id="port" type="int">
+         <name>Port</name>
+         <value>5432</value>
+         <description>The TCP port number through which the database
+         server should be accessed.</description>
+       </variable>
+
        <variable id="name" type="string">
          <name>Database Name</name>
          <value>planetlab3</value>