Does not exit after w/W, so as to allow for a restart to be issued afterwards

[myplc.git] / plc_config.xml

diff --git a/plc_config.xml b/plc_config.xml
index 6a0799a..a9e1a7e 100644 (file)
--- a/plc_config.xml
+++ b/plc_config.xml
@@ -1,5 +1,15 @@
-<?xml version="1.0"?>
-<!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "configuration.dtd">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Default PLC configuration file
+
+Mark Huang <mlhuang@cs.princeton.edu>
+Copyright (C) 2006 The Trustees of Princeton University
+
+$Id: plc_config.xml,v 1.11 2006/04/24 18:04:25 mlhuang Exp $
+-->
+
+<!DOCTYPE configuration PUBLIC "-//PlanetLab Central//DTD PLC configuration//EN" "plc_config.dtd">
 
 <configuration>
   <variables>
@@ -28,9 +38,9 @@
          not be changed.</description>
        </variable>
 
-       <variable id="root_user" type="password">
+       <variable id="root_user" type="email">
          <name>Root Account</name>
-         <value>root@test.planet-lab.org</value>
+         <value>root@localhost.localdomain</value>
          <description>The name of the initial administrative
          account. We recommend that this account be used only to create
          additional accounts associated with real
@@ -127,9 +137,9 @@
          and warnings.</description>
        </variable>
 
-       <variable id="support_address">
+       <variable id="support_address" type="email">
          <name>Support Address</name>
-         <value>root@localhost</value>
+         <value>root+support@localhost.localdomain</value>
          <description>This address is used for support
          requests. Support requests may include traffic complaints,
          security incident reporting, web site malfunctions, and
@@ -138,13 +148,19 @@
          Tracker.</description>
        </variable>
 
-       <variable id="boot_address">
+       <variable id="boot_address" type="email">
          <name>Boot Messages Address</name>
-         <value>root@localhost</value>
+         <value>root+install-msgs@localhost.localdomain</value>
          <description>The API will notify this address when a problem
-         occurs during node installation or boot. If a domain is not
-         specified, the default system domain will be used
-         name.</description>
+         occurs during node installation or boot.</description>
+       </variable>
+
+       <variable id="slice_address" type="email">
+         <name>Slice Address</name>
+         <value>root+SLICE@localhost.localdomain</value>
+         <description>This address template is used for sending
+         e-mail notifications to slices. SLICE will be replaced with
+         the name of the slice.</description>
        </variable>
       </variablelist>
     </category>
@@ -170,7 +186,7 @@
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
-         <value>localhost</value>
+         <value>localhost.localdomain</value>
          <description>The fully qualified hostname or IP address of
          the database server. This hostname must be resolvable and
          reachable by the rest of your installation.</description>
@@ -227,7 +243,7 @@
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
-         <value>localhost</value>
+         <value>localhost.localdomain</value>
          <description>The fully qualified hostname or IP address of
          the API server. This hostname must be resolvable and
          reachable by the rest of your installation, as well as your
@@ -253,7 +269,7 @@
 
        <variable id="maintenance_user" type="string">
          <name>Maintenance User</name>
-         <value>maint@test.planet-lab.org</value>
+         <value>maint@localhost.localdomain</value>
          <description>The username of the maintenance account. This
          account is used by local scripts that perform automated
          tasks, and cannot be used for normal logins.</description>
@@ -330,7 +346,7 @@
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
-         <value>localhost</value>
+         <value>localhost.localdomain</value>
          <description>The fully qualified hostname or IP address of
          the web server. This hostname must be resolvable and
          reachable by the rest of your installation, as well as your
@@ -393,7 +409,7 @@
 
        <variable id="host" type="hostname">
          <name>Hostname</name>
-         <value>localhost</value>
+         <value>localhost.localdomain</value>
          <description>The fully qualified hostname or IP address of
          the boot server. This hostname must be resolvable and
          reachable by the rest of your installation, as well as your