aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/zabbix2/zabbix2-agent.inc44
-rw-r--r--config/zabbix2/zabbix2-proxy.inc43
-rw-r--r--pkg_config.10.xml4
-rw-r--r--pkg_config.8.xml4
4 files changed, 25 insertions, 70 deletions
diff --git a/config/zabbix2/zabbix2-agent.inc b/config/zabbix2/zabbix2-agent.inc
index 4aa0d5f7..1d78a6eb 100644
--- a/config/zabbix2/zabbix2-agent.inc
+++ b/config/zabbix2/zabbix2-agent.inc
@@ -33,33 +33,19 @@ require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("globals.inc");
-function php_zabbix2_pfs_version() {
- $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
- return $pfs_version;
-}
-
-function php_zabbix2_pkg_base($pfs_version) {
- if ($pfs_version >= 2.2) {
- // pfSense 2.2 with zabbix 2.4
- $zabbix2_pkg_base = "zabbix24";
- } else {
- // pfSense 2.1 with zabbix 2.2
- $zabbix2_pkg_base = "zabbix22";
- }
- return $zabbix2_pkg_base;
+global $zabbix2_pkg_base;
+$pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
+if ($pfs_version == "2.2") {
+ // pfSense 2.2 with zabbix 2.4
+ $zabbix2_pkg_base = "zabbix24";
+} else {
+ // pfSense 2.1 with zabbix 2.2
+ $zabbix2_pkg_base = "zabbix22";
}
+define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
function php_deinstall_zabbix2_agent() {
- global $config, $g;
-
- $pfs_version = php_zabbix2_pfs_version();
- $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
-
- if ($pfs_version == "2.1" || $pfs_version == "2.2") {
- define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
- } else {
- define('ZABBIX_AGENT_BASE', '/usr/local');
- }
+ global $config, $g, $zabbix2_pkg_base;
mwexec("/usr/bin/killall zabbix_agentd");
@@ -144,17 +130,9 @@ function validate_input_zabbix2_agent($post, &$input_errors) {
}
function sync_package_zabbix2_agent() {
- global $config, $g;
+ global $config, $g, $zabbix2_pkg_base;
conf_mount_rw();
- $pfs_version = php_zabbix2_pfs_version();
- $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
-
- if ($pfs_version == "2.1" || $pfs_version == "2.2") {
- define('ZABBIX_AGENT_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-agent-' . php_uname("m"));
- } else {
- define('ZABBIX_AGENT_BASE', '/usr/local');
- }
// Check zabbix agent settings
if (is_array($config['installedpackages']['zabbixagent'])) {
diff --git a/config/zabbix2/zabbix2-proxy.inc b/config/zabbix2/zabbix2-proxy.inc
index aa21b817..16f2d93d 100644
--- a/config/zabbix2/zabbix2-proxy.inc
+++ b/config/zabbix2/zabbix2-proxy.inc
@@ -33,33 +33,18 @@ require_once("functions.inc");
require_once("pkg-utils.inc");
require_once("globals.inc");
-function php_zabbix2_pfs_version() {
- $pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
- return $pfs_version;
-}
-
-function php_zabbix2_pkg_base($pfs_version) {
- if ($pfs_version >= 2.2) {
- // pfSense 2.2 with zabbix 2.4
- $zabbix2_pkg_base = "zabbix24";
- } else {
- // pfSense 2.1 with zabbix 2.2
- $zabbix2_pkg_base = "zabbix22";
- }
- return $zabbix2_pkg_base;
+global $zabbix2_pkg_base;
+$pfs_version = substr(trim(file_get_contents("/etc/version")), 0, 3);
+if ($pfs_version == "2.2") {
+ $zabbix2_pkg_base = "zabbix24";
+} else {
+ // pfSense 2.1 with zabbix 2.2
+ $zabbix2_pkg_base = "zabbix22";
}
+define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
function php_deinstall_zabbix2_proxy() {
- global $config, $g;
-
- $pfs_version = php_zabbix2_pfs_version();
- $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
-
- if ($pfs_version == "2.1" || $pfs_version == "2.2") {
- define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
- } else {
- define('ZABBIX_PROXY_BASE', '/usr/local');
- }
+ global $config, $g, $zabbix2_pkg_base;
exec("/usr/bin/killall zabbix_proxy");
unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/" . $zabbix2_pkg_base . "/zabbix_proxy.conf");
@@ -98,17 +83,9 @@ function validate_input_zabbix2_proxy($post, &$input_errors) {
}
function sync_package_zabbix2_proxy() {
- global $config, $g;
+ global $config, $g, $zabbix2_pkg_base;
conf_mount_rw();
- $pfs_version = php_zabbix2_pfs_version();
- $zabbix2_pkg_base = php_zabbix2_pkg_base($pfs_version);
-
- if ($pfs_version == "2.1" || $pfs_version == "2.2") {
- define('ZABBIX_PROXY_BASE', '/usr/pbi/' . $zabbix2_pkg_base . '-proxy-' . php_uname("m"));
- } else {
- define('ZABBIX_PROXY_BASE', '/usr/local');
- }
// Check zabbix proxy config
if (is_array($config['installedpackages']['zabbixproxy'])) {
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d376401b..da44946a 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1638,7 +1638,7 @@
<website>http://www.zabbix.com/product.php</website>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<status>BETA</status>
<required_version>2.2</required_version>
<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1663,7 +1663,7 @@
<website>http://www.zabbix.com/product.php</website>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<status>BETA</status>
<required_version>2.2</required_version>
<configurationfile>zabbix2-proxy.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index adc1a9f2..398d172b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1643,7 +1643,7 @@
<descr>Monitoring agent.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
- <version>zabbix2-agent-2.2.5 pkg v0.8.5</version>
+ <version>zabbix2-agent-2.2.5 pkg v0.8.6</version>
<status>BETA</status>
<required_version>2.1</required_version>
<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1661,7 +1661,7 @@
<descr>Monitoring agent proxy.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
- <version>zabbix2-proxy-2.2.5 pkg v0.8.5</version>
+ <version>zabbix2-proxy-2.2.5 pkg v0.8.6</version>
<status>BETA</status>
<required_version>2.1</required_version>
<configurationfile>zabbix2-proxy.xml</configurationfile>