From 1b54529ce154582ceadbea88d2a160d7b6e92149 Mon Sep 17 00:00:00 2001
From: "Danilo G. Baio (dbaio)" <dbaio@bsd.com.br>
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(-)

(limited to 'config')

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 @@
 			<size>10</size>
 			<required>true</required>
 		</field>
-                <field>
+		<field>
 			<fielddescr>Advanced Parameters</fielddescr>
 			<fieldname>advancedparams</fieldname>
 			<encoding>base64</encoding>
@@ -138,7 +138,6 @@
 			<cols>50</cols>
 			<description>Advanced parameters. There are some rarely used parameters that sometimes need to be defined. Value has form, example: StartDiscoverers=10</description>
 		</field>
-
 	</fields>
 	<custom_php_install_command>sync_package_zabbix2();</custom_php_install_command>
 	<custom_php_command_before_form></custom_php_command_before_form>
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)" <dbaio@bsd.com.br>
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 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

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 @@
 	<name>zabbixagent</name>
 	<title>Services: Zabbix-2 Agent</title>
 	<category>Monitoring</category>
-	<version>0.8_0</version>
+	<version>0.8_1</version>
 	<include_file>/usr/local/pkg/zabbix2.inc</include_file>
 	<addedit_string>Zabbix Agent has been created/modified.</addedit_string>
 	<delete_string>Zabbix Agent has been deleted.</delete_string>
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 @@
 	<name>zabbixproxy</name>
 	<title>Services: Zabbix-2 Proxy</title>
 	<category>Monitoring</category>
-	<version>0.8_0</version>
+	<version>0.8_1</version>
 	<include_file>/usr/local/pkg/zabbix2.inc</include_file>
 	<addedit_string>Zabbix Proxy has been created/modified.</addedit_string>
 	<delete_string>Zabbix Proxy has been deleted.</delete_string>
-- 
cgit v1.2.3