Merge branch 'master' of ssh://git.onelab.eu/git/myplc

diff --git a/default_config.xml b/default_config.xml
index 3ced370..94d4ab5 100644 (file)
--- a/default_config.xml
+++ b/default_config.xml
@@ -746,6 +746,21 @@ $URL$
           <value>support</value>
           <description>All messages from Monitor will be copied to this address.</description>
         </variable>
+        <variable id="dbhost" type="hostname">
+          <name>Database Hostname</name>
+          <value>localhost</value>
+          <description>The hostname for the monitor database.</description>
+        </variable>
+        <variable id="dbuser" type="string">
+          <name>Database User</name>
+          <value>monitoruser</value>
+          <description>The username for connecting to the monitor database.</description>
+        </variable>
+        <variable id="dbname" type="string">
+          <name>Database Name</name>
+          <value>monitor</value>
+          <description>Name of monitor database.</description>
+        </variable>
         <variable id="dbpassword" type="password">
           <name>Database Password</name>
           <value></value>

diff --git a/plc.d/dns b/plc.d/dns
index aea50f7..377a269 100755 (executable)
--- a/plc.d/dns
+++ b/plc.d/dns
@@ -15,7 +15,7 @@
 . /etc/plc.d/functions
 . /etc/planetlab/plc_config
 
-SIGNATURE="; generated by /etc/plc.d/dns --- DO NOT REMOVE THIS TEXT!"
+SIGNATURE="; generated by /etc/plc.d/dns --- DO NOT REMOVE THIS TEXT"
 
 # Be verbose
 set -x