aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2015-02-17 14:29:14 -0500
committerjim-p <jimp@pfsense.org>2015-02-17 14:29:14 -0500
commit00ba5768761785a0510f40529d80d35db2a09482 (patch)
treec77f679e16cbfe115715698cb044a450b1b88981
parentb644cfe9163f2e4231688727bcc2eabe486edae7 (diff)
downloadpfsense-packages-00ba5768761785a0510f40529d80d35db2a09482.tar.gz
pfsense-packages-00ba5768761785a0510f40529d80d35db2a09482.tar.bz2
pfsense-packages-00ba5768761785a0510f40529d80d35db2a09482.zip
Clarify Zabbix Major/Minor versions in name. Add back Zabbix 2.2 versions of the packages for pfSense 2.2 alongside the Zabbix 2.4 packages.
-rw-r--r--pkg_config.10.xml41
-rw-r--r--pkg_config.8.xml4
-rw-r--r--pkg_config.8.xml.amd644
3 files changed, 41 insertions, 8 deletions
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 7656cd69..d30e8f99 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1303,11 +1303,44 @@
<configurationfile>syslog-ng.xml</configurationfile>
</package>
<package>
- <name>Zabbix-2 Agent</name>
+ <name>Zabbix-2.2 Agent</name>
<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.4.3 pkg v0.8.3</version>
+ <version>zabbix22-agent-2.2.7 pkg v0.8.3</version>
+ <status>BETA</status>
+ <required_version>2.2</required_version>
+ <configurationfile>zabbix2-agent.xml</configurationfile>
+ <maintainer>dbaio@bsd.com.br</maintainer>
+ <build_pbi>
+ <custom_name>zabbix22-agent</custom_name>
+ <port>net-mgmt/zabbix22-agent</port>
+ </build_pbi>
+ <depends_on_package_pbi>zabbix22-agent-2.2.7-##ARCH##.pbi</depends_on_package_pbi>
+ </package>
+ <package>
+ <name>Zabbix-2.2 Proxy</name>
+ <descr>Monitoring agent proxy.</descr>
+ <category>Services</category>
+ <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
+ <version>zabbix22-proxy-2.2.7 pkg v0.8.3</version>
+ <status>BETA</status>
+ <required_version>2.2</required_version>
+ <configurationfile>zabbix2-proxy.xml</configurationfile>
+ <maintainer>dbaio@bsd.com.br</maintainer>
+ <build_pbi>
+ <custom_name>zabbix22-proxy</custom_name>
+ <port>net-mgmt/zabbix22-proxy</port>
+ </build_pbi>
+ <build_options>OPTIONS_SET+= SQLITE IPV6;OPTIONS_UNSET+= MYSQL JABBER GSSAPI</build_options>
+ <depends_on_package_pbi>zabbix22-proxy-2.2.7-##ARCH##.pbi</depends_on_package_pbi>
+ </package>
+ <package>
+ <name>Zabbix-2.4 Agent</name>
+ <descr>Monitoring agent.</descr>
+ <category>Services</category>
+ <config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
+ <version>zabbix24-agent-2.4.3 pkg v0.8.3</version>
<status>BETA</status>
<required_version>2.2</required_version>
<configurationfile>zabbix2-agent.xml</configurationfile>
@@ -1319,11 +1352,11 @@
<depends_on_package_pbi>zabbix24-agent-2.4.3-##ARCH##.pbi</depends_on_package_pbi>
</package>
<package>
- <name>Zabbix-2 Proxy</name>
+ <name>Zabbix-2.4 Proxy</name>
<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.4.3 pkg v0.8.3</version>
+ <version>zabbix24-proxy-2.4.3 pkg v0.8.3</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 d6587606..9e99d84d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1751,7 +1751,7 @@
<configurationfile>syslog-ng.xml</configurationfile>
</package>
<package>
- <name>Zabbix-2 Agent</name>
+ <name>Zabbix-2.2 Agent</name>
<descr>Monitoring agent.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
@@ -1769,7 +1769,7 @@
<depends_on_package_pbi>zabbix22-agent-2.2.5-i386.pbi</depends_on_package_pbi>
</package>
<package>
- <name>Zabbix-2 Proxy</name>
+ <name>Zabbix-2.2 Proxy</name>
<descr>Monitoring agent proxy.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 33f1a27f..492cb8d3 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1738,7 +1738,7 @@
<configurationfile>syslog-ng.xml</configurationfile>
</package>
<package>
- <name>Zabbix-2 Agent</name>
+ <name>Zabbix-2.2 Agent</name>
<descr>Monitoring agent.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-agent.xml</config_file>
@@ -1756,7 +1756,7 @@
<depends_on_package_pbi>zabbix22-agent-2.2.5-amd64.pbi</depends_on_package_pbi>
</package>
<package>
- <name>Zabbix-2 Proxy</name>
+ <name>Zabbix-2.2 Proxy</name>
<descr>Monitoring agent proxy.</descr>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix2/zabbix2-proxy.xml</config_file>