Merge branch 'master' of ssh://soltesz@git.planet-lab.org/git/monitor

[monitor.git] / monitor-default.conf

diff --git a/monitor-default.conf b/monitor-default.conf
index 967a6ae..9a5a52f 100644 (file)
--- a/monitor-default.conf
+++ b/monitor-default.conf
@@ -35,6 +35,8 @@ 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
@@ -42,6 +44,7 @@ zabbix_dburi=postgres://zabbixuser:<...>@localhost:5432/zabbix
 cachetime=60
 
 [commandline]
+embedded=True
 echo=False
 debug=0
 mail=1