diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2015-05-14 10:42:36 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2015-05-14 10:42:36 -0300 |
| commit | 5b319c946be102bec4d7f21eb7eff42e85ceb4b4 (patch) | |
| tree | a91061e520dfec192e22f8a1d1614d6cd3c4a75d | |
| parent | 0c9a566a742e665ddfb856e6ac7b33596871525c (diff) | |
| download | pfsense-packages-5b319c946be102bec4d7f21eb7eff42e85ceb4b4.tar.gz pfsense-packages-5b319c946be102bec4d7f21eb7eff42e85ceb4b4.tar.bz2 pfsense-packages-5b319c946be102bec4d7f21eb7eff42e85ceb4b4.zip | |
Sanitize zabbix LTS version, add run_depends, port_category and fix pbi detection for 2.3+
| -rw-r--r-- | config/zabbix-lts/zabbix-lts.inc | 16 | ||||
| -rw-r--r-- | pkg_config.10.xml | 10 |
2 files changed, 17 insertions, 9 deletions
diff --git a/config/zabbix-lts/zabbix-lts.inc b/config/zabbix-lts/zabbix-lts.inc index 450b78a1..af446261 100644 --- a/config/zabbix-lts/zabbix-lts.inc +++ b/config/zabbix-lts/zabbix-lts.inc @@ -38,6 +38,15 @@ require_once("functions.inc"); require_once("pkg-utils.inc"); require_once("globals.inc"); +$pf_version=substr(trim(file_get_contents("/etc/version")),0,3); +if ($pf_version == "2.1" || $pf_version == "2.2") { + define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); + define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); +} else { + define('ZABBIX_AGENT_BASE', '/usr/local'); + define('ZABBIX_AGENT_BASE', '/usr/local'); +} + function php_install_zabbix_lts(){ sync_package_zabbix_lts(); } @@ -47,8 +56,6 @@ function php_deinstall_zabbix_agent_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); - exec("/usr/bin/killall zabbix_agentd"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/rc.d/zabbix_agentd_lts.sh"); unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf"); @@ -70,8 +77,6 @@ function php_deinstall_zabbix_proxy_lts(){ conf_mount_rw(); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); - exec("/usr/bin/killall zabbix_proxy"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/rc.d/zabbix_proxy_lts.sh"); unlink_if_exists(ZABBIX_PROXY_BASE . "/etc/zabbix22/zabbix_proxy.conf"); @@ -170,9 +175,6 @@ function sync_package_zabbix_lts(){ conf_mount_rw(); - define('ZABBIX_AGENT_BASE', '/usr/pbi/zabbix22-agent-' . php_uname("m")); - define('ZABBIX_PROXY_BASE', '/usr/pbi/zabbix22-proxy-' . php_uname("m")); - #check zabbix proxy config if (is_array($config['installedpackages']['zabbixproxylts'])){ $zbproxy_config = $config['installedpackages']['zabbixproxylts']['config'][0]; diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 7aa1f403..03fcd303 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -1454,17 +1454,20 @@ </package> <package> <name>Zabbix Agent LTS</name> + <internal_name>zabbix-agent</internal_name> <descr>LTS (Long Term Support) release of Zabbix Monitoring agent. Zabbix LTS releases are supported for Zabbix customers during five (5) years i.e. 3 years of Full Support (general, critical and security issues) and 2 additional years of Limited Support (critical and security issues only). Zabbix LTS version release will result in change of the first version number. More info in http://www.zabbix.com/life_cycle_and_release_policy.php </descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-agent-lts.xml</config_file> - <version>zabbix-agent-lts-2.2.7 pkg v0.8.3</version> + <version>0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-agent-lts.xml</configurationfile> <maintainer>dbaio@bsd.com.br</maintainer> + <port_category>net-mgmt</port_category> + <run_depends>sbin/zabbix_agent:net-mgmt/zabbix22-agent</run_depends> <build_pbi> <custom_name>zabbix22-agent</custom_name> <port>net-mgmt/zabbix22-agent</port> @@ -1474,17 +1477,20 @@ </package> <package> <name>Zabbix Proxy LTS</name> + <internal_name>zabbix-proxy</internal_name> <descr>LTS (Long Term Support) release of Zabbix agent proxy. Zabbix LTS releases are supported for Zabbix customers during five (5) years i.e. 3 years of Full Support (general, critical and security issues) and 2 additional years of Limited Support (critical and security issues only). Zabbix LTS version release will result in change of the first version number. More info in http://www.zabbix.com/life_cycle_and_release_policy.php </descr> <category>Services</category> <config_file>https://packages.pfsense.org/packages/config/zabbix-lts/zabbix-proxy-lts.xml</config_file> - <version>zabbix-proxy-lts-2.2.7 pkg v0.8.3</version> + <version>0.8.3</version> <status>BETA</status> <required_version>2.2</required_version> <configurationfile>zabbix-proxy-lts.xml</configurationfile> <maintainer>dbaio@bsd.com.br</maintainer> + <port_category>net-mgmt</port_category> + <run_depends>sbin/zabbix_proxy:net-mgmt/zabbix22-proxy</run_depends> <build_pbi> <custom_name>zabbix22-proxy</custom_name> <port>net-mgmt/zabbix22-proxy</port> |