Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zabbix-agent-lts - Nuke PBI junk #19

Merged
merged 5 commits into from
Dec 9, 2015
Merged

zabbix-agent-lts - Nuke PBI junk #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
349d334
Nuke PBI junk
doktornotor Dec 9, 2015
e0c5772
Bump zabbix-agent package version
doktornotor Dec 9, 2015
08cff66
Update pkg-descr
doktornotor Dec 9, 2015
ef3cd4c
Bump zabbix-agent package version, nuke unneeded stuff
doktornotor Dec 9, 2015
402b8fd
Bump zabbix-agent package version
doktornotor Dec 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net-mgmt/pfSense-pkg-zabbix-agent/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= pfSense-pkg-zabbix-agent
PORTVERSION= 0.8.8
PORTVERSION= 0.8.9
CATEGORIES= net-mgmt
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down
7 changes: 1 addition & 6 deletions net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/pkg/zabbix-agent-lts.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ 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"));
} else {
define('ZABBIX_AGENT_BASE', '/usr/local');
}
define('ZABBIX_AGENT_BASE', '/usr/local');

function php_deinstall_zabbix_agent_lts() {
unlink_if_exists(ZABBIX_AGENT_BASE . "/etc/zabbix22/zabbix_agentd.conf");
Expand Down
3 changes: 1 addition & 2 deletions net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/pkg/zabbix-agent-lts.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<name>zabbixagentlts</name>
<title>Services: Zabbix Agent LTS</title>
<category>Monitoring</category>
<version>0.8.8</version>
<version>0.8.9</version>
<include_file>/usr/local/pkg/zabbix-agent-lts.inc</include_file>
<addedit_string>Zabbix Agent LTS has been created/modified.</addedit_string>
<delete_string>Zabbix Agent LTS has been deleted.</delete_string>
Expand All @@ -59,7 +59,6 @@
</additional_files_needed>
<menu>
<name>Zabbix Agent LTS</name>
<tooltiptext>Setup Zabbix Agent specific settings</tooltiptext>
<section>Services</section>
<url>/pkg_edit.php?xml=zabbix-agent-lts.xml&amp;id=0</url>
</menu>
Expand Down
12 changes: 2 additions & 10 deletions net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/share/pfSense-pkg-zabbix-agent/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,10 @@
More info in &lt;a href=&quot;http://www.zabbix.com/life_cycle_and_release_policy.php&quot;&gt;Zabbix Life Cycle and Release Policy&lt;/a&gt;.]]></descr>
<website>http://www.zabbix.com/product.php</website>
<category>Services</category>
<config_file>https://packages.pfsense.org/packages/config/zabbix-agent-lts/zabbix-agent-lts.xml</config_file>
<version>0.8.8</version>
<version>0.8.9</version>
<status>BETA</status>
<required_version>2.2</required_version>
<required_version>2.3</required_version>
<configurationfile>zabbix-agent-lts.xml</configurationfile>
<maintainer>[email protected]</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>
</build_pbi>
<depends_on_package_pbi>zabbix22-agent-2.2.7-##ARCH##.pbi</depends_on_package_pbi>
</package>
</pfsensepkgs>
15 changes: 6 additions & 9 deletions net-mgmt/pfSense-pkg-zabbix-agent/pkg-descr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
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.<br /> More
info in <a
href="http://www.zabbix.com/life_cycle_and_release_policy.php">Zabbix
Life Cycle and Release Policy</a>.
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.

WWW: http://www.zabbix.com/life_cycle_and_release_policy.php