diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-03-07 11:09:41 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-03-07 11:09:41 -0300 |
| commit | 30ee4251923b097e269d8110ca3f7d2112fcd9b6 (patch) | |
| tree | 1188431742d7edf76cb83f18cbce2ca0dcc272db /config | |
| parent | 51b49f5f1a214a565194ea2db3bb0231689309c7 (diff) | |
| parent | cdbc87a7bdf93eb41464b8b2326ea11fc1fb4cbe (diff) | |
| download | pfsense-packages-30ee4251923b097e269d8110ca3f7d2112fcd9b6.tar.gz pfsense-packages-30ee4251923b097e269d8110ca3f7d2112fcd9b6.tar.bz2 pfsense-packages-30ee4251923b097e269d8110ca3f7d2112fcd9b6.zip | |
Merge pull request #621 from dbaio/master
zabbix2 - update packages
Diffstat (limited to 'config')
| -rw-r--r-- | config/zabbix2/zabbix2-agent.xml | 2 | ||||
| -rw-r--r-- | config/zabbix2/zabbix2-proxy.xml | 5 | ||||
| -rw-r--r-- | config/zabbix2/zabbix2.inc | 2 |
3 files changed, 4 insertions, 5 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 @@ <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 982b321b..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> @@ -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']} |