httpd takes care of /var/log/plcapi.log and permissions

[myplc.git] / default_config.xml

diff --git a/default_config.xml b/default_config.xml
index a97ed77..68c47a5 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -39,7 +39,7 @@ Copyright (C) 2006 The Trustees of Princeton University
        <variable id="hrn_root" type="string">
          <name>Root in Hierarchical Naming Space </name>
          <value>planetlab.test</value>
-         <description> The root of this peer in the hierarchical federation naming space.</description>
+         <description> The root of this peer in the hierarchical federation naming space. if SFA services are setup on top of this PLC deplyment, the SFA_INTERFACE_HRN needs to be equal to PLC_HRN_ROOT</description>
        </variable>
 
        <variable id="slice_prefix" type="string">
@@ -123,6 +123,20 @@ Copyright (C) 2006 The Trustees of Princeton University
       <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>
+         <description>Allows to compute a virtualization mechanism
+         from an fcdistro. Starting with 5.2 MyPLC has support for
+         either 'vs' or 'lxc', and this gives a correspondance from
+         the node's fcdistro to the right virtualization mechanism.
+         This information is essentially used by the BootManager for
+         getting the installation phase right like e.g. when
+         partitioning disks, and not to figure the contents of the
+         nodeimage that depend only on fcdistro, pldistro and of
+         course arch. This can be overridden by setting the vrt tag
+         on that particular node. </description>
+       </variable>
+
        <variable id="node_arch" type="string">
          <name>arch for nodes</name>
          <value>@ARCH@</value>
@@ -659,25 +673,6 @@ Copyright (C) 2006 The Trustees of Princeton University
           <description>The fully qualified hostname of the XMPP server.</description>
         </variable>
 
-        <variable id="xmpp_user" type="string">
-          <name>XMPP username</name>
-          <value></value>
-          <description>XMPP username (which has admin rights).</description>
-        </variable>
-
-        <variable id="xmpp_password" type="string">
-          <name>XMPP password</name>
-          <value></value>
-          <description>The password of the XMPP user.</description>
-        </variable>
-
-        <!-- omf-slicemgr -->
-        <variable id="slicemgr_url" type="string">
-          <name>OMF Slicemgr URL</name>
-          <value>http://localhost.localdomain:5053</value>
-          <description>.</description>
-        </variable>
-
       </variablelist>
     </category>