From 93f0a31c1b9db3c4e8d6a10cc91e04980075baf6 Mon Sep 17 00:00:00 2001 From: "Danilo G. Baio (dbaio)" Date: Fri, 27 Dec 2013 19:43:56 -0200 Subject: zabbix2 - update packages to 2.2.1 - second step --- config/zabbix2/zabbix2-agent.xml | 2 +- config/zabbix2/zabbix2-proxy.xml | 2 +- config/zabbix2/zabbix2.inc | 12 ++++++------ pkg_config.8.xml | 12 ++++++------ pkg_config.8.xml.amd64 | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/config/zabbix2/zabbix2-agent.xml b/config/zabbix2/zabbix2-agent.xml index 0169e11f..3f8e84db 100644 --- a/config/zabbix2/zabbix2-agent.xml +++ b/config/zabbix2/zabbix2-agent.xml @@ -41,7 +41,7 @@ zabbixagent Services: Zabbix-2 Agent Monitoring - 0.7_1 + 0.8_0 /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 c687c5ba..c857bec1 100644 --- a/config/zabbix2/zabbix2-proxy.xml +++ b/config/zabbix2/zabbix2-proxy.xml @@ -41,7 +41,7 @@ zabbixproxy Services: Zabbix-2 Proxy Monitoring - 0.7_1 + 0.8_0 /usr/local/pkg/zabbix2.inc Zabbix Proxy has been created/modified. Zabbix Proxy has been deleted. diff --git a/config/zabbix2/zabbix2.inc b/config/zabbix2/zabbix2.inc index 0a1c12be..3a4b5840 100644 --- a/config/zabbix2/zabbix2.inc +++ b/config/zabbix2/zabbix2.inc @@ -55,7 +55,7 @@ function php_deinstall_zabbix2_agent(){ exec("/usr/bin/killall zabbix_agentd"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix2_agentd.sh"); - unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf"); + unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); unlink_if_exists("/var/log/zabbix2/zabbix2_agentd.log"); unlink_if_exists("/var/run/zabbix2/zabbix2_agentd.pid"); @@ -82,7 +82,7 @@ function php_deinstall_zabbix2_proxy(){ exec("/usr/bin/killall zabbix_proxy"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix2_proxy.sh"); - unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf"); + unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf"); unlink_if_exists("/var/log/zabbix2/zabbix_proxy.log"); unlink_if_exists("/var/run/zabbix2/zabbix2_proxy.pid"); @@ -208,7 +208,7 @@ Fping6Location=/usr/local/sbin/fping6 ProxyMode={$Mode} EOF; - file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix2/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); + file_put_contents(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf", strtr($zbproxy_conf_file, array("\r" => ""))); } } /* check zabbix agent settings*/ @@ -242,7 +242,7 @@ StartAgents={$StartAgents} {$UserParams} EOF; - file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix2/zabbix_agentd.conf", strtr($zbagent_conf_file, array("\r" => ""))); + file_put_contents(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf", strtr($zbagent_conf_file, array("\r" => ""))); } } $want_sysctls = array( @@ -291,8 +291,8 @@ EOF; /*check startup script files*/ /* create a few directories and ensure the sample files are in place */ - if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix2")) - exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix2"); + if (!is_dir(ZABBIX_PROXY_BASE . "/etc/zabbix22")) + exec("/bin/mkdir -p " . ZABBIX_PROXY_BASE . "/etc/zabbix22"); $dir_checks = <<< EOF if [ ! -d /var/log/zabbix2 ] diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 3ca0321a..27d6f21f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -1915,7 +1915,7 @@ Monitoring agent. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.0.8 pkg v0.7_1 + zabbix2-agent-2.2.1 pkg v0.8_0 BETA 2.0 zabbix2-agent.xml @@ -1926,15 +1926,15 @@ net-mgmt/zabbix22-agent http://files.pfsense.org/packages/8/All/ - zabbix2-agent-2.0.8.tbz - zabbix2-agent-2.0.8-i386.pbi + zabbix22-agent-2.2.1.tbz + zabbix22-agent-2.2.1-i386.pbi Zabbix-2 Proxy Monitoring agent proxy. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.0.8 pkg v0.7_1 + zabbix2-proxy-2.2.1 pkg v0.8_0 BETA 2.0 zabbix2-proxy.xml @@ -1946,8 +1946,8 @@ OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI http://files.pfsense.org/packages/8/All/ - zabbix2-proxy-2.0.8.tbz - zabbix2-proxy-2.0.8-i386.pbi + zabbix22-proxy-2.2.1.tbz + zabbix22-proxy-2.2.1-i386.pbi diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index cb65f8e4..1f43a074 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -1902,7 +1902,7 @@ Monitoring agent. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml - zabbix2-agent-2.0.8 pkg v0.7_1 + zabbix2-agent-2.2.1 pkg v0.8_0 BETA 2.0 zabbix2-agent.xml @@ -1913,15 +1913,15 @@ net-mgmt/zabbix22-agent http://files.pfsense.org/packages/amd64/8/All/ - zabbix2-agent-2.0.8.tbz - zabbix2-agent-2.0.8-amd64.pbi + zabbix22-agent-2.2.1.tbz + zabbix22-agent-2.2.1-amd64.pbi Zabbix-2 Proxy Monitoring agent proxy. Services http://www.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml - zabbix2-proxy-2.0.8 pkg v0.7_1 + zabbix2-proxy-2.2.1 pkg v0.8_0 BETA 2.0 zabbix2-proxy.xml @@ -1933,8 +1933,8 @@ OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI http://files.pfsense.org/packages/amd64/8/All/ - zabbix2-proxy-2.0.8.tbz - zabbix2-proxy-2.0.8-amd64.pbi + zabbix22-proxy-2.2.1.tbz + zabbix22-proxy-2.2.1-amd64.pbi -- cgit v1.2.3