clearer names for actions, and infer actions better

[monitor.git] / monitor-default.conf

diff --git a/monitor-default.conf b/monitor-default.conf
index d8d1e40..e17030e 100644 (file)
--- a/monitor-default.conf
+++ b/monitor-default.conf
@@ -10,6 +10,7 @@ RT_WEB_TOOLS_PATH=
 RT_WEB_USER=
 RT_WEB_PASSWORD=
 RT_WEB_DEBUG=0
+RT_QUEUE=
 
 # PLC admin account
 API_SERVER=https://boot.planet-lab.org/PLCAPI/
@@ -18,16 +19,36 @@ API_AUTH_PASSWORD=
 
 # SERVER PATHS
 MONITOR_HOSTNAME=monitor.planet-lab.org
-MONITOR_SCRIPT_ROOT=
-MONITOR_DATA_ROOT=
-MONITOR_DATA_ROOTWEB=/var/www/cgi-bin/pdb
-MONITOR_ARCHIVE_ROOT=
+MONITOR_SCRIPT_ROOT=/usr/share/monitor
+MONITOR_DATA_ROOT=/var/lib/monitor
+MONITOR_ARCHIVE_ROOT=/var/lib/monitor/archive-pdb
+MONITOR_IP=
+MONITOR_HOSTNAME=
+
+email=monitor@planet-lab.org
+# all messages will appear to be from this address
+from_email=monitor@planet-lab.org
+
+# a separate address for support messages
+support_email=support@planet-lab.org
+
+# mailing list copied on all out-going messages
+cc_email=monitor-list@lists.planet-lab.org
+
+zabbix_enabled=0
+
+[monitordatabase]
+monitor_dburi=postgres://user:passwd@localhost:5432/infovacuum
+zabbix_dburi=postgres://zabbixuser:<...>@localhost:5432/zabbix
+
+cachetime=60
 
 [commandline]
+embedded=True
+echo=False
 debug=0
 mail=1
 bcc=0
-email=
 run=False
 checkopt=False
 squeeze=1