From 1b54529ce154582ceadbea88d2a160d7b6e92149 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Thu, 6 Mar 2014 23:12:30 -0300 Subject: zabbix2 - fix typos --- config/zabbix2/zabbix2-proxy.xml | 3 +-- config/zabbix2/zabbix2.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml index 982b321b..56094fb9 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -129,7 +129,7 @@ 10 true - + Advanced Parameters advancedparams base64 @@ -138,7 +138,6 @@ 50 Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10 - sync_package_zabbix2(); diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc index c08c5487..bf9c6606 100644 --- a/config/zabbix2/zabbix2.inc +++ b/config/zabbix2/zabbix2.inc @@ -193,7 +193,7 @@ function sync_package_zabbix2(){ $zbproxy_config = $config['installedpackages']['zabbixproxy']['config'][0]; if ($zbproxy_config['proxyenabled']=="on"){ $Mode=(is_numericint($zbproxy_config['proxymode'])?$zbproxy_config['proxymode'] : 0); - $AdvancedParams=base64_decode($zbagent_config['advancedparams']); + $AdvancedParams=base64_decode($zbproxy_config['advancedparams']); $zbproxy_conf_file = <<< EOF Server={$zbproxy_config['server']} -- cgit v1.2.3 From cdbc87a7bdf93eb41464b8b2326ea11fc1fb4cbe Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Fri, 7 Mar 2014 08:36:09 -0300 Subject: zabbix2 - update packages to 2.2.2 and bump version --- config/zabbix2/zabbix2-agent.xml | 2 +- config/zabbix2/zabbix2-proxy.xml | 2 +- pkg_config.10.xml | 8 ++++---- pkg_config.8.xml | 12 ++++++------ pkg_config.8.xml.amd64 | 12 ++++++------ 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml index 3f8e84db..9dc11bbd 100644 --- a/config/zabbix2/zabbix2-agent.xml +++ b/config/zabbix2/zabbix2-agent.xml @@ -41,7 +41,7 @@ zabbixagent Services: Zabbix-2 Agent Monitoring - 0.8_0 + 0.8_1 /usr/local/pkg/zabbix2.inc Zabbix Agent has been created/modified. Zabbix Agent has been deleted. diff --git a/config/zabbix2/zabbix2-proxy.xml b/config/zabbix2/zabbix2-proxy.xml index 56094fb9..369443ba 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -41,7 +41,7 @@ zabbixproxy Services: Zabbix-2 Proxy Monitoring - 0.8_0 + 0.8_1 /usr/local/pkg/zabbix2.inc Zabbix Proxy has been created/modified. Zabbix Proxy has been deleted. diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 483e802a..e7d4b22b 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1451,7 +1451,7 @@ Monitoring agent. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.2.1 pkg v0.8_0 + zabbix2-agent-2.2.2 pkg v0.8_1 BETA 2.2 zabbix2-agent.xml @@ -1460,14 +1460,14 @@ zabbix22-agent net-mgmt/zabbix22-agent - zabbix22-agent-2.2.1_2-##ARCH##.pbi + zabbix22-agent-2.2.2-##ARCH##.pbi Zabbix-2 Proxy Monitoring agent proxy. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.2.1 pkg v0.8_0 + zabbix2-proxy-2.2.2 pkg v0.8_1 BETA 2.2 zabbix2-proxy.xml @@ -1477,7 +1477,7 @@ net-mgmt/zabbix22-proxy OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI - zabbix22-proxy-2.2.1_2-##ARCH##.pbi + zabbix22-proxy-2.2.2-##ARCH##.pbi diff --git a/pkg_config.8.xml b/pkg_config.8.xml index f050f718..efe5e33b 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1887,7 +1887,7 @@ Monitoring agent. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.2.1 pkg v0.8_0 + zabbix2-agent-2.2.2 pkg v0.8_1 BETA 2.0 zabbix2-agent.xml @@ -1898,15 +1898,15 @@ net-mgmt/zabbix22-agent http://files.pfsense.org/packages/8/All/ - zabbix22-agent-2.2.1.tbz - zabbix22-agent-2.2.1-i386.pbi + zabbix22-agent-2.2.2.tbz + zabbix22-agent-2.2.2-i386.pbi Zabbix-2 Proxy Monitoring agent proxy. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.2.1 pkg v0.8_0 + zabbix2-proxy-2.2.2 pkg v0.8_1 BETA 2.0 zabbix2-proxy.xml @@ -1918,8 +1918,8 @@ OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI http://files.pfsense.org/packages/8/All/ - zabbix22-proxy-2.2.1.tbz - zabbix22-proxy-2.2.1-i386.pbi + zabbix22-proxy-2.2.2.tbz + zabbix22-proxy-2.2.2-i386.pbi diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 7ce216b9..da2fdcb5 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1874,7 +1874,7 @@ Monitoring agent. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.2.1 pkg v0.8_0 + zabbix2-agent-2.2.2 pkg v0.8_1 BETA 2.0 zabbix2-agent.xml @@ -1885,15 +1885,15 @@ net-mgmt/zabbix22-agent http://files.pfsense.org/packages/amd64/8/All/ - zabbix22-agent-2.2.1.tbz - zabbix22-agent-2.2.1-amd64.pbi + zabbix22-agent-2.2.2.tbz + zabbix22-agent-2.2.2-amd64.pbi Zabbix-2 Proxy Monitoring agent proxy. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.2.1 pkg v0.8_0 + zabbix2-proxy-2.2.2 pkg v0.8_1 BETA 2.0 zabbix2-proxy.xml @@ -1905,8 +1905,8 @@ OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI http://files.pfsense.org/packages/amd64/8/All/ - zabbix22-proxy-2.2.1.tbz - zabbix22-proxy-2.2.1-amd64.pbi + zabbix22-proxy-2.2.2.tbz + zabbix22-proxy-2.2.2-amd64.pbi -- cgit v1.2.3