aboutsummaryrefslogtreecommitdiffstats
path: root/config/zabbix2/zabbix2.inc
diff options
context:
space:
mode:
authorRobert Middleswarth <robert@middleswarth.net>2014-03-02 17:19:42 -0500
committerRobert Middleswarth <robert@middleswarth.net>2014-03-02 17:19:42 -0500
commit2799c464e83a4039e61b86429fd1cc3de22b6162 (patch)
treec68a5ec6ed08b28598df06c5a265bf386e13759f /config/zabbix2/zabbix2.inc
parentf4d2b1698d54f886b3fbbd0750b1b1fa74c1aef6 (diff)
downloadpfsense-packages-2799c464e83a4039e61b86429fd1cc3de22b6162.tar.gz
pfsense-packages-2799c464e83a4039e61b86429fd1cc3de22b6162.tar.bz2
pfsense-packages-2799c464e83a4039e61b86429fd1cc3de22b6162.zip
Add an Advanced Parameters to the proxy settings.
Diffstat (limited to 'config/zabbix2/zabbix2.inc')
-rw-r--r--config/zabbix2/zabbix2.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc
index 92aad309..c08c5487 100644
--- a/config/zabbix2/zabbix2.inc
+++ b/config/zabbix2/zabbix2.inc
@@ -193,6 +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']);
$zbproxy_conf_file = <<< EOF
Server={$zbproxy_config['server']}
@@ -206,6 +207,7 @@ FpingLocation=/usr/local/sbin/fping
#there's currently no fping6 (IPv6) dependency in the package, but if there was, the binary would likely also be in /usr/local/sbin
Fping6Location=/usr/local/sbin/fping6
ProxyMode={$Mode}
+{$AdvancedParams}
EOF;
file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => "")));