Merge branch 'master' into erp5-component

component/zabbix/buildout.cfg

@@ -4,8 +4,8 @@ parts =
 
 [zabbix-agent]
 recipe = slapos.recipe.cmmi
-url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.1.tar.gz?download
-md5sum = 3b301aa4f2b7cb5ede46884b9c7873e1
+url = http://prdownloads.sourceforge.net/zabbix/zabbix-2.0.5.tar.gz?download
+md5sum = 0c0721c31889b63bce9aa556bcb927e8
 configure-options =
   --enable-agent
   --enable-ipv6

slapos/recipe/zabbixagent/__init__.py

@@ -119,10 +119,13 @@ class Recipe(BaseSlapRecipe):
     # self.cron_d is a directory, where cron jobs can be registered
     self.cron_d = self.installCrond()
     self.logrotate_d, self.logrotate_backup = self.installLogrotate()
-    zabbix_agentd_conf = self.installZabbixAgentd(self.getGlobalIPv6Address(),
-                                                  10050,
-                                                  self.parameter_dict['hostname'],
-                                                  self.parameter_dict['server'])
+    zabbix_agentd_conf = self.installZabbixAgentd(
+        self.getGlobalIPv6Address(),
+        10050,
+        self.parameter_dict['hostname'],
+        self.parameter_dict['server'],
+        self.parameter_dict.get('custom-user-parameter', '')
+    )
     self.setConnectionDict(dict(ip=zabbix_agentd_conf['ip'],
       name=zabbix_agentd_conf['hostname'],
       port=str(zabbix_agentd_conf['port'])))