X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=default_config.xml;h=dba531f69dbc111fe80390f2b21bbeeadf3e2ab3;hb=09b123f14152db85ea963d7885a1d405160408bd;hp=637b352dfb9723e3d8e64c68933aae9a848862a5;hpb=391310e122de0536c08f62bd46acd3b3b7b13964;p=myplc.git

diff --git a/default_config.xml b/default_config.xml
index 637b352..dba531f 100644
--- a/default_config.xml
+++ b/default_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: default_config.xml 1078 2007-11-15 13:38:27Z thierry $
+$Id$
 -->
 
 <!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
@@ -178,6 +178,16 @@ $Id: default_config.xml 1078 2007-11-15 13:38:27Z thierry $
 	  occurs during node installation or boot.</description>
 	</variable>
 
+	<variable id="mom_list_address" type="email">
+	  <name>Mom List Address</name>
+	  <value>root+mom@localhost.localdomain</value>
+	  <description>This address is used by operations staff
+	  to monitor Mom (formerly pl_mom) messages indicating
+	  excessive BW or memory usage by a slice.  Mom messages sent
+	  to slices will be cc'ed to this list so as not to clog
+	  the Support Address list.</description>
+	</variable>
+
 	<variable id="slice_address" type="email">
 	  <name>Slice Address</name>
 	  <value>root+SLICE@localhost.localdomain</value>
@@ -284,6 +294,20 @@ $Id: default_config.xml 1078 2007-11-15 13:38:27Z thierry $
           resolvable by the configured DNS servers.</description>
         </variable>
 
+        <variable id="ipod_subnet" type="ip">
+          <name>IP Subnet</name>
+          <value>127.0.0.1</value>
+          <description>The IP Subnet for all API servers. 
+	  Used to identify IPoD packet senders.</description>
+        </variable>
+
+        <variable id="ipod_mask" type="ip">
+          <name>IP Mask</name>
+          <value>255.255.255.255</value>
+          <description>The IP Mask that should be applied to incoming 
+	  packets to match the IP Subnet for IPoD packets.</description>
+        </variable>
+
 	<variable id="port" type="int">
 	  <name>Port</name>
 	  <value>443</value>
@@ -517,114 +541,7 @@ $Id: default_config.xml 1078 2007-11-15 13:38:27Z thierry $
   </variables>
 
   <comps>
-    <!-- xxx should be deprecated - not used anymore xxx -->
-    <group>
-      <id>plc</id>
-      <name>PlanetLab Central</name>
-      <default>true</default>
-      <description>PlanetLab Central Packages</description>
-      <uservisible>true</uservisible>
-      <packagelist>
-	<!-- Basics -->
-	<packagereq type="mandatory">dev</packagereq>	
-	<packagereq type="mandatory">findutils</packagereq>
-
-
-	<!-- kernel-vserver is intended for the vserver-reference, but
-	     serves the same useful purpose for MyPLC, namely, to
-	     Provide: kernel without actually installing anything. -->
-	<packagereq type="mandatory">kernel-vserver</packagereq>	
-
-	<!-- Sending mail -->
-	<packagereq type="mandatory">sendmail</packagereq>
-	<packagereq type="mandatory">sendmail-cf</packagereq>
-
-	<!-- Caching DNS server -->
-	<packagereq type="mandatory">dnsmasq</packagereq>
-
-	<!-- (Optional) Synchronizing with PLC -->
-	<packagereq type="mandatory">rsync</packagereq>
-
-	<!-- Cron jobs -->
-	<packagereq type="mandatory">vixie-cron</packagereq>	
-
-	<!-- Other utilities -->
-	<packagereq type="mandatory">cvs</packagereq>
-	<packagereq type="mandatory">curl</packagereq>
-	<packagereq type="mandatory">wget</packagereq>
-	<packagereq type="mandatory">less</packagereq>
-	<packagereq type="mandatory">gzip</packagereq>
-	<packagereq type="mandatory">bzip2</packagereq>
-	<packagereq type="mandatory">cpio</packagereq>
-	<packagereq type="mandatory">tar</packagereq>
-	<packagereq type="mandatory">diffutils</packagereq>
-
-	<!-- yum >=2.2 uses a new repository format -->
-	<packagereq type="mandatory">createrepo</packagereq>
-	<packagereq type="mandatory">yum</packagereq>
-	<packagereq type="mandatory">rpm</packagereq>
-
-	<!-- For mkpasswd -->
-	<packagereq type="mandatory">expect</packagereq>
-
-	<!-- For ssh-keygen -->
-	<packagereq type="mandatory">openssh</packagereq>
-
-	<!-- Almost all scripts are written in Python -->
-	<packagereq type="mandatory">python</packagereq>
-	<packagereq type="mandatory">python-devel</packagereq>
-
-	<!-- Database server -->
-	<packagereq type="mandatory">postgresql</packagereq>
-	<packagereq type="mandatory">postgresql-server</packagereq>
-	<packagereq type="mandatory">postgresql-python</packagereq>
-
-	<!-- (Secure) web server -->
-	<packagereq type="mandatory">httpd</packagereq>
-	<packagereq type="mandatory">mod_ssl</packagereq>
-
-	<!-- Web pages are written primarily in PHP. A few pages still
-	     access the DB directly. -->
-	<packagereq type="mandatory">php</packagereq>
-	<packagereq type="mandatory">php-pgsql</packagereq>
-	<!-- PLCAPI replaces php-xmlrpc -->
-	<!-- <packagereq type="mandatory">php-xmlrpc</packagereq> -->
-
-	<!-- Need GD for ImageCreate(), etc. -->
-	<packagereq type="mandatory">gd</packagereq>	
-	<packagereq type="mandatory">php-gd</packagereq>	
-	<packagereq type="mandatory">perl-GD</packagereq>	
-
-	<!-- API server is implemented in mod_python -->
-	<packagereq type="mandatory">mod_python</packagereq>
-
-	<!-- API server uses a few non-standard packages -->
-	<packagereq type="mandatory">PLCAPI</packagereq>
-	<packagereq type="mandatory">SOAPpy</packagereq>
-	<packagereq type="mandatory">PyXML</packagereq>
-
-	<!-- API server uses SSL to sign tickets -->
-	<packagereq type="mandatory">xmlsec1</packagereq>
-	<packagereq type="mandatory">xmlsec1-openssl</packagereq>
-	<packagereq type="mandatory">openssl</packagereq>
-
-	<!-- Customizable Boot CD and Boot Manager packages -->
-	<packagereq type="mandatory">bootcd</packagereq>
-	<packagereq type="mandatory">bootmanager</packagereq>
-
-	<!-- PLCWWW now packaged separately from myplc -->
-	<packagereq type="mandatory">plcwww</packagereq>
-
-	<!-- apache user needs root access for building node-dependent images -->
-	<packagereq type="mandatory">sudo</packagereq>
-
-	<!-- OneLab specifics - for convenience -->
-	<packagereq type="mandatory">vim-minimal</packagereq>
-	<packagereq type="mandatory">python-imaging</packagereq>
-
-      </packagelist>
-    </group>
-
+    <!-- deprecated - not used anymore - use .lst files instead -->
   </comps>
 
 </configuration>