egrep is obsolete

[myplc.git] / default_config.xml

diff --git a/default_config.xml b/default_config.xml
index 68c47a5..a88a180 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -121,7 +121,7 @@ Copyright (C) 2006 The Trustees of Princeton University
     <category id="plc_flavour">
       <name>Flavours</name>
       <description>Defaults for nodes and slices contents.</description>
-      
+
       <variablelist>
        <variable id="virt_map" type="string">
          <value> f8,f12,f14,centos5,centos6:vs; default:lxc </value>
@@ -276,6 +276,16 @@ Copyright (C) 2006 The Trustees of Princeton University
          Tracker.</description>
        </variable>
 
+       <variable id="from_address" type="email">
+         <name>From Address</name>
+         <value>root@localhost.localdomain</value>
+         <description>All e-mail notifications and warnings will appear
+         to come from this address. Older versions used PLC_MAIL_SUPPORT_ADDRESS here.
+         Choosing a different address can be useful in a context where SPF is in place.
+         A good test is to try an enroll an account with a gmail account.
+         </description>
+       </variable>
+
        <variable id="boot_address" type="email">
          <name>Boot Messages Address</name>
          <value>root+install-msgs@localhost.localdomain</value>
@@ -402,14 +412,14 @@ Copyright (C) 2006 The Trustees of Princeton University
         <variable id="ipod_subnet" type="ip">
           <name>IP Subnet</name>
           <value>127.0.0.1</value>
-          <description>The IP Subnet for all API servers. 
+          <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 
+          <description>The IP Mask that should be applied to incoming
          packets to match the IP Subnet for IPoD packets.</description>
         </variable>