* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/2.2/, net-analyzer/zabbix/, net-analyzer/zabbix/files/, ...
@ 2020-02-28 15:02 Miroslav Šulc
0 siblings, 0 replies; only message in thread
From: Miroslav Šulc @ 2020-02-28 15:02 UTC (permalink / raw
To: gentoo-commits
commit: 9dd83ba9636be855abf97ac682cd55be731f0ce2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 15:01:10 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 15:02:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd83ba9
net-analyzer/zabbix: bumps + security fixes + rewritten + removed obsolete
1) many changes and improvements
2) config directory and files are not writeable by zabbix
3) creation of pid file disabled in zabbix, using s-s-d instead
Bug: https://bugs.gentoo.org/629882
Bug: https://bugs.gentoo.org/709926
Bug: https://bugs.gentoo.org/629884
Closes: https://bugs.gentoo.org/665960
Closes: https://bugs.gentoo.org/670652
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
net-analyzer/zabbix/Manifest | 10 +-
net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd | 28 -
net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy | 27 -
net-analyzer/zabbix/files/2.2/init.d/zabbix-server | 26 -
.../zabbix/files/2.2/patches/zbx7479.patch | 83 ---
.../zabbix/files/2.2/patches/zbx8151.patch | 53 --
net-analyzer/zabbix/files/2.2/zabbix_agent.conf | 81 ---
net-analyzer/zabbix/files/2.2/zabbix_agentd.conf | 278 ---------
net-analyzer/zabbix/files/2.2/zabbix_proxy.conf | 519 ----------------
net-analyzer/zabbix/files/2.2/zabbix_server.conf | 546 -----------------
net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd | 28 -
net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy | 27 -
net-analyzer/zabbix/files/3.0/init.d/zabbix-server | 26 -
net-analyzer/zabbix/files/3.0/zabbix_agent.conf | 81 ---
net-analyzer/zabbix/files/3.0/zabbix_agentd.conf | 390 ------------
net-analyzer/zabbix/files/3.0/zabbix_proxy.conf | 674 ---------------------
net-analyzer/zabbix/files/3.0/zabbix_server.conf | 635 -------------------
.../zabbix/files/zabbix-3.0.30-mysql8.patch | 17 +
.../zabbix-3.0.30-security-disable-PidFile.patch | 49 ++
...fix.patch => zabbix-4.0.18-modulepathfix.patch} | 0
.../zabbix-4.0.18-security-disable-PidFile.patch | 49 ++
net-analyzer/zabbix/files/zabbix-agentd.init | 20 +
net-analyzer/zabbix/files/zabbix-agentd.service | 10 +-
.../zabbix-jmx-proxy => zabbix-jmx-proxy.conf} | 0
.../zabbix-jmx-proxy => zabbix-jmx-proxy.init} | 0
net-analyzer/zabbix/files/zabbix-proxy.init | 20 +
net-analyzer/zabbix/files/zabbix-proxy.service | 8 +-
net-analyzer/zabbix/files/zabbix-server.init | 19 +
net-analyzer/zabbix/files/zabbix-server.service | 11 +-
net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild | 340 -----------
net-analyzer/zabbix/zabbix-3.0.28.ebuild | 330 ----------
.../{zabbix-3.4.15.ebuild => zabbix-3.0.30.ebuild} | 204 ++++---
net-analyzer/zabbix/zabbix-4.0.13.ebuild | 332 ----------
.../{zabbix-4.2.7.ebuild => zabbix-4.0.18.ebuild} | 207 ++++---
net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild | 333 ----------
.../{zabbix-4.4.5.ebuild => zabbix-4.4.6.ebuild} | 204 ++++---
36 files changed, 523 insertions(+), 5142 deletions(-)
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 0ca440546b7..4f50f6f2d42 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,7 +1,3 @@
-DIST zabbix-2.2.16.tar.gz 15498413 BLAKE2B fc634ca5124525b3143bb736b53b5040c8f1fd45ecfcf3cc2bdf7e625d54b0fcfa3690ce5d766e987d320d9ccbf7f430957f532c31f180a0a037334d6eb5b51a SHA512 5d92c17e86608359fff220416d5eed2d4ac10edfe56f4162f4b7660c472cf6f609ba01034d76e5b7164c22d55a1fc5be753f5d0e0ce7ac71d00a6f68dca14afd
-DIST zabbix-3.0.28.tar.gz 14706285 BLAKE2B ef7f7e59e229847daa92d1bc4771cd0feb627adb914978b1213dbf93ee52d102dedff2a502dc076a6f13456e8808cca9b556b407af81c2af9e1141f973143d17 SHA512 e406c8e51319a05bdf70093f6b9ef47cbe9b276ff0969369b022a260e38f12acf43fb8e2e8295fafe55d2288853a522bdb6cb339f79cad74cb2233807eb27a46
-DIST zabbix-3.4.15.tar.gz 17489570 BLAKE2B 8b820e29334fa7814ab54baef75374955340cb907802722a4f91496a35c7a26fc1c37178c264f606f8a4a95cea350e493763e55f44033eb2aa97ec889664908a SHA512 d210c6576a6c5d67a1f58bb51436c815a191a2ea62f6929784fcac6e0da09febdbb42c11dfb791b6a6d5897dbdda02e10bf56f9162b7f9fb34a57c34b8b1c62f
-DIST zabbix-4.0.13.tar.gz 17150333 BLAKE2B fe4eaf999c0fbe4c87ca2bb621ce229480840f3e86de5e7b02d3668d5705046e62bf04f4f4ad75e814c1fa795642df3c0a9d1bfb07ef25c33003b12e0fe44c7b SHA512 150d28b1be88821be30ef1a9d74ac62e6939f556ef13e6acc6c99b915d36d1655d776aeb2399009285404724dfa41acf249b9047797890a954941831c8b5ecba
-DIST zabbix-4.2.7.tar.gz 18286402 BLAKE2B 36fbd5938d6d188b29fb2e284a8b2ddec1e3cfda08517094e06fae6ccad9dea8027368f4a1a98cb49957caf0aee580df01a17f4aa19a98e746e2c1164db4b590 SHA512 92341e4efe721f043b66bdd382fc69bc408c4e0435a594fadf51989c37d8ecbd72ae0092517929b521527b41331f933310e9c14da42f18902ca54460170dddf9
-DIST zabbix-4.4.0.tar.gz 20689807 BLAKE2B 7be62a7b124a016a9f3ab5022b349452b1a99c9ef8cff8ba4b8278f7c48a7632d7f3e6677764fd778c44c05fdb86bbe2b066eb6a51f076274fffcbbd94202db4 SHA512 021e7454decb885065417f6f6a0ecc8a9d4f184f68da6ab4efea68280b3a0c0641eab05620ce14016b6e57ce32c44075e53b45f03e764e8726c00bfdd6039406
-DIST zabbix-4.4.5.tar.gz 19284769 BLAKE2B e0c7b99c48128a2379c46d2125497816d484afc1d0e2b8d6d7da5ca93a494346980af0dc90a7f63f7ea5719b7aec6baa658f060fbdfaaddf5102883c2590da1f SHA512 b7971f3c25270c5e35861a0db8e810d8ffe6c59ffc935fa2df5b1fd5d591d577db60e04673ca0a6f158dd126245a6ee4cd4e84a3637c447c9b6f68f77848f114
+DIST zabbix-3.0.30.tar.gz 14700686 BLAKE2B 9caa772c8dfdd53411bc996b8c97dce7c24853ea1049fe3cb71048c089105af5c7d1cf51071d91d1d2a98113181e9977a1ca3b4304e42a4a2f8bb0b87cd725b8 SHA512 6e60c9e5570aa69e1d52f005094eda1618aafc6d7ee831d4e5dc26f64b0691e2d9e494845fd36d22b049175776057fca28142da31d5e8e06d6c6f3e003bde3a3
+DIST zabbix-4.0.18.tar.gz 17200784 BLAKE2B 00c447459518d4c3a600e82f42f2ae14bcda6d8a933eb25a31fb00951f556355925e90960b76e273c2cc08a83b476e7c1a98b2e94aa4c23363fd639d4b199ac5 SHA512 c686611f60242cb2bef408bacbd71b7f3e88ad01b5ac9c34566c36812c9469c85c2388a9efd2ded5b329a3ffa7ec474845f2bac4e100e66b80078823c276cecb
+DIST zabbix-4.4.6.tar.gz 19371211 BLAKE2B b63d946f360c529bfc32070e2907cdfada34ee3615c24c6a65ada7379e2ad65ff8e1d182ff9b59e11c844103cb608aafeab0f2bc6bb97fc1a31183214a6df01e SHA512 f9e84872f0210e497261462de95e9096391fc74bee6fd511087825fcfdd8f363003bd090e01a8a092a69ef1f01c4dd31d623f5321cf77dbced0bd337fb91682c
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd
deleted file mode 100644
index 50db578f6b5..00000000000
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-agentd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_agentd.pid"
-
-depend() {
- need net
- provide zabbix-agent
- use zabbix-server
-}
-
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix agent"
- start-stop-daemon --start --pidfile ${pid_file} \
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix agent"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy
deleted file mode 100644
index 81bd4f3607a..00000000000
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-proxy
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_proxy.pid"
-
-depend() {
- need net
- provide zabbix-proxy
-}
-
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix proxy"
- start-stop-daemon --start --pidfile ${pid_file} \
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix proxy"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server b/net-analyzer/zabbix/files/2.2/init.d/zabbix-server
deleted file mode 100644
index abc9002f464..00000000000
--- a/net-analyzer/zabbix/files/2.2/init.d/zabbix-server
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_server.pid"
-
-depend() {
- need net
- use mysql postgresql
-}
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix server"
- start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
- --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix server"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch
deleted file mode 100644
index 79bb92f4bae..00000000000
--- a/net-analyzer/zabbix/files/2.2/patches/zbx7479.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Index: src/libs/zbxsysinfo/sysinfo.c
-===================================================================
---- src/libs/zbxsysinfo/sysinfo.c (revision 40348)
-+++ src/libs/zbxsysinfo/sysinfo.c (working copy)
-@@ -427,13 +427,49 @@
- test_aliases();
- }
-
-+static int zbx_check_user_parameter(const char *param, char *error, int max_error_len)
-+{
-+ const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@\n", *c;
-+ char *buf = NULL;
-+ size_t buf_alloc = 128, buf_offset = 0;
-+
-+ if (0 != CONFIG_UNSAFE_USER_PARAMETERS)
-+ return SUCCEED;
-+
-+ for (c = suppressed_chars; '\0' != *c; c++)
-+ {
-+ if (NULL == strchr(param, *c))
-+ continue;
-+
-+ buf = zbx_malloc(buf, buf_alloc);
-+
-+ for (c = suppressed_chars; '\0' != *c; c++)
-+ {
-+ if (c != suppressed_chars)
-+ zbx_strcpy_alloc(&buf, &buf_alloc, &buf_offset, ", ");
-+
-+ if (0 != isprint(*c))
-+ zbx_chrcpy_alloc(&buf, &buf_alloc, &buf_offset, *c);
-+ else
-+ zbx_snprintf_alloc(&buf, &buf_alloc, &buf_offset, "0x%02x", *c);
-+ }
-+
-+ zbx_snprintf(error, max_error_len, "special characters \"%s\" are not allowed in the parameters", buf);
-+
-+ zbx_free(buf);
-+
-+ return FAIL;
-+ }
-+
-+ return SUCCEED;
-+}
-+
- static int replace_param(const char *cmd, const char *param, char *out, int outlen, char *error, int max_error_len)
- {
- int ret = SUCCEED;
- char buf[MAX_STRING_LEN];
- char command[MAX_STRING_LEN];
- char *pl, *pr;
-- const char suppressed_chars[] = "\\'\"`*?[]{}~$!&;()<>|#@", *c;
-
- assert(out);
-
-@@ -465,25 +501,10 @@
- {
- get_param(param, (int)(pr[1] - '0'), buf, sizeof(buf));
-
-- if (0 == CONFIG_UNSAFE_USER_PARAMETERS)
-- {
-- for (c = suppressed_chars; '\0' != *c; c++)
-- {
-- if (NULL != strchr(buf, *c))
-- {
-- zbx_snprintf(error, max_error_len, "Special characters '%s'"
-- " are not allowed in the parameters",
-- suppressed_chars);
-- ret = FAIL;
-- break;
-- }
-- }
-- }
-+ if (SUCCEED != (ret = zbx_check_user_parameter(buf, error, max_error_len)))
-+ break;
- }
-
-- if (FAIL == ret)
-- break;
--
- zbx_strlcat(out, buf, outlen);
- outlen -= MIN((int)strlen(buf), (int)outlen);
-
diff --git a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch
deleted file mode 100644
index 076e10ab75a..00000000000
--- a/net-analyzer/zabbix/files/2.2/patches/zbx8151.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Index: frontends/php/include/defines.inc.php
-===================================================================
---- frontends/php/include/defines.inc.php (revision 46596)
-+++ frontends/php/include/defines.inc.php (revision 46655)
-@@ -835,6 +835,14 @@
-
- define('ZBX_DEFAULT_IMPORT_HOST_GROUP', 'Imported hosts');
-
-+// XML import flags
-+// See ZBX-8151. Old version of libxml suffered from setting DTDLOAD and NOENT flags by default, which allowed
-+// performing XXE attacks. Calling libxml_disable_entity_loader(true) also had no affect if flags passed to libxml
-+// calls were 0 - so for better security with legacy libxml we need to call libxml_disable_entity_loader(true) AND
-+// pass the LIBXML_NONET flag. Please keep in mind that LIBXML_NOENT actually EXPANDS entities, opposite to it's name -
-+// so this flag is not needed here.
-+define('LIBXML_IMPORT_FLAGS', LIBXML_NONET);
-+
- // API errors
- define('ZBX_API_ERROR_INTERNAL', 111);
- define('ZBX_API_ERROR_PARAMETERS', 100);
-Index: frontends/php/include/classes/import/readers/CXmlImportReader.php
-===================================================================
---- frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46596)
-+++ frontends/php/include/classes/import/readers/CXmlImportReader.php (revision 46655)
-@@ -32,7 +32,8 @@
- */
- public function read($string) {
- libxml_use_internal_errors(true);
-- $result = simplexml_load_string($string);
-+ libxml_disable_entity_loader(true);
-+ $result = simplexml_load_string($string, null, LIBXML_IMPORT_FLAGS);
- if (!$result) {
- $errors = libxml_get_errors();
- libxml_clear_errors();
-Index: frontends/php/include/classes/import/CXmlImport18.php
-===================================================================
---- frontends/php/include/classes/import/CXmlImport18.php (revision 46596)
-+++ frontends/php/include/classes/import/CXmlImport18.php (revision 46655)
-@@ -390,12 +390,13 @@
- return $array;
- }
-
-- public static function import($file) {
-+ public static function import($source) {
-
- libxml_use_internal_errors(true);
-+ libxml_disable_entity_loader(true);
-
- $xml = new DOMDocument();
-- if (!$xml->loadXML($file)) {
-+ if (!$xml->loadXML($source, LIBXML_IMPORT_FLAGS)) {
- $text = '';
- foreach (libxml_get_errors() as $error) {
- switch ($error->level) {
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf b/net-analyzer/zabbix/files/2.2/zabbix_agent.conf
deleted file mode 100644
index dcb4b7248c2..00000000000
--- a/net-analyzer/zabbix/files/2.2/zabbix_agent.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-# This is a config file for Zabbix internet service daemon agent
-# To get more information about Zabbix visit http://www.zabbix.com
-
-### Option: Server
-# IP address of Zabbix server
-# Connections from other hosts will be denied
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
-#
-# Mandatory: yes
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-############ ADVANCED PARAMETERS #################
-
-### Option: Alias
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
-#
-# Mandatory: no
-# Range:
-# Default:
-
-### Option: Timeout
-# Spend no more than Timeout seconds on processing
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_agent.userparams.conf
-# Include=/usr/local/etc/zabbix_agent.conf.d/
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-# Allow all characters to be passed in arguments to user-defined parameters.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# UnsafeUserParameters=0
-
-### Option: UserParameter
-# User-defined parameter to monitor. There can be several user-defined parameters.
-# Format: UserParameter=<key>,<shell command>
-# See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of agent modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at agent startup. Modules are used to extend functionality of the agent.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf
deleted file mode 100644
index 4d49d3685e8..00000000000
--- a/net-analyzer/zabbix/files/2.2/zabbix_agentd.conf
+++ /dev/null
@@ -1,278 +0,0 @@
-# This is a config file for the Zabbix agent daemon (Unix)
-# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-PidFile=/run/zabbix/zabbix_agentd.pid
-
-### Option: LogFile
-# Name of log file.
-# If not set, syslog is used.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level
-# 0 - no debug
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: EnableRemoteCommands
-# Whether remote commands from Zabbix server are allowed.
-# 0 - not allowed
-# 1 - allowed
-#
-# Mandatory: no
-# Default:
-# EnableRemoteCommands=0
-
-### Option: LogRemoteCommands
-# Enable logging of executed shell commands as warnings.
-# 0 - disabled
-# 1 - enabled
-#
-# Mandatory: no
-# Default:
-# LogRemoteCommands=0
-
-##### Passive checks related
-
-### Option: Server
-# List of comma delimited IP addresses (or hostnames) of Zabbix servers.
-# Incoming connections will be accepted only from the hosts listed here.
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
-#
-# Mandatory: no
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-### Option: ListenPort
-# Agent will listen on this port for connections from the server.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10050
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the agent should listen on.
-# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: StartAgents
-# Number of pre-forked instances of zabbix_agentd that process passive checks.
-# If set to 0, disables passive checks and the agent will not listen on any TCP port.
-#
-# Mandatory: no
-# Range: 0-100
-# Default:
-# StartAgents=3
-
-##### Active checks related
-
-### Option: ServerActive
-# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks.
-# If port is not specified, default port is used.
-# IPv6 addresses must be enclosed in square brackets if port for that host is specified.
-# If port is not specified, square brackets for IPv6 addresses are optional.
-# If this parameter is not specified, active checks are disabled.
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
-#
-# Mandatory: no
-# Default:
-# ServerActive=
-
-ServerActive=127.0.0.1
-
-### Option: Hostname
-# Unique, case sensitive hostname.
-# Required for active checks and must match hostname as configured on the server.
-# Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=Zabbix server
-
-### Option: HostnameItem
-# Item used for generating Hostname if it is undefined.
-# Ignored if Hostname is defined.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: HostMetadata
-# Optional parameter that defines host metadata.
-# Host metadata is used at host auto-registration process.
-# An agent will issue an error and not start if the value is over limit of 255 characters.
-# If not defined, value will be acquired from HostMetadataItem.
-#
-# Mandatory: no
-# Range: 0-255 characters
-# Default:
-# HostMetadata=
-
-### Option: HostMetadataItem
-# Optional parameter that defines an item used for getting host metadata.
-# Host metadata is used at host auto-registration process.
-# During an auto-registration request an agent will log a warning message if
-# the value returned by specified item is over limit of 255 characters.
-# This option is only used when HostMetadata is not defined.
-#
-# Mandatory: no
-# Default:
-# HostMetadataItem=
-
-### Option: RefreshActiveChecks
-# How often list of active checks is refreshed, in seconds.
-#
-# Mandatory: no
-# Range: 60-3600
-# Default:
-# RefreshActiveChecks=120
-
-### Option: BufferSend
-# Do not keep data longer than N seconds in buffer.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# BufferSend=5
-
-### Option: BufferSize
-# Maximum number of values in a memory buffer. The agent will send
-# all collected data to Zabbix Server or Proxy if the buffer is full.
-#
-# Mandatory: no
-# Range: 2-65535
-# Default:
-# BufferSize=100
-
-### Option: MaxLinesPerSecond
-# Maximum number of new lines the agent will send per second to Zabbix Server
-# or Proxy processing 'log' and 'logrt' active checks.
-# The provided value will be overridden by the parameter 'maxlines',
-# provided in 'log' or 'logrt' item keys.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# MaxLinesPerSecond=100
-
-############ ADVANCED PARAMETERS #################
-
-### Option: Alias
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
-#
-# Mandatory: no
-# Range:
-# Default:
-
-### Option: Timeout
-# Spend no more than Timeout seconds on processing
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: AllowRoot
-# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_agentd.userparams.conf
-# Include=/usr/local/etc/zabbix_agentd.conf.d/
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-# Allow all characters to be passed in arguments to user-defined parameters.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# UnsafeUserParameters=0
-
-### Option: UserParameter
-# User-defined parameter to monitor. There can be several user-defined parameters.
-# Format: UserParameter=<key>,<shell command>
-# See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of agent modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at agent startup. Modules are used to extend functionality of the agent.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf
deleted file mode 100644
index d4bae2ea962..00000000000
--- a/net-analyzer/zabbix/files/2.2/zabbix_proxy.conf
+++ /dev/null
@@ -1,519 +0,0 @@
-# This is a configuration file for Zabbix Proxy process
-# To get more information about Zabbix,
-# visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: ProxyMode
-# Proxy operating mode
-# 0 - proxy in the active mode
-# 1 - proxy in the passive mode
-#
-# Mandatory: no
-# Default:
-# ProxyMode=0
-
-### Option: Server
-# IP address (or hostname) of Zabbix server.
-# Active proxy will get configuration data from the server.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: yes (if ProxyMode is set to 0)
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-### Option: ServerPort
-# Port of Zabbix trapper on Zabbix server.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ServerPort=10051
-
-### Option: Hostname
-# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
-# Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=Zabbix proxy
-
-### Option: HostnameItem
-# Item used for generating Hostname if it is undefined.
-# Ignored if Hostname is defined.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: ListenPort
-# Listen port for trapper.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10051
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: LogFile
-# Name of log file.
-# If not set, syslog is used.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_proxy.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level
-# 0 - no debug
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-PidFile=/run/zabbix/zabbix_proxy.pid
-
-### Option: DBHost
-# Database host name.
-# If set to localhost, socket is used for MySQL.
-# If set to empty string, socket is used for PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBHost=localhost
-
-### Option: DBName
-# Database name.
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
-# Warning: do not attempt to use the same database Zabbix server is using.
-#
-# Mandatory: yes
-# Default:
-# DBName=
-
-DBName=zabbix_proxy
-
-### Option: DBSchema
-# Schema name. Used for IBM DB2.
-#
-# Mandatory: no
-# Default:
-# DBSchema=
-
-### Option: DBUser
-# Database user. Ignored for SQLite.
-#
-# Default:
-# DBUser=
-
-DBUser=root
-
-### Option: DBPassword
-# Database password. Ignored for SQLite.
-# Comment this line if no password is used.
-#
-# Mandatory: no
-# Default:
-# DBPassword=
-
-### Option: DBSocket
-# Path to MySQL socket.
-#
-# Mandatory: no
-# Default:
-# DBSocket=/tmp/mysql.sock
-
-# Option: DBPort
-# Database port when not using local socket. Ignored for SQLite.
-#
-# Mandatory: no
-# Default (for MySQL):
-# DBPort=3306
-
-######### PROXY SPECIFIC PARAMETERS #############
-
-### Option: ProxyLocalBuffer
-# Proxy will keep data locally for N hours, even if the data have already been synced with the server.
-# This parameter may be used if local data will be used by third party applications.
-#
-# Mandatory: no
-# Range: 0-720
-# Default:
-# ProxyLocalBuffer=0
-
-### Option: ProxyOfflineBuffer
-# Proxy will keep data for N hours in case if no connectivity with Zabbix Server.
-# Older data will be lost.
-#
-# Mandatory: no
-# Range: 1-720
-# Default:
-# ProxyOfflineBuffer=1
-
-### Option: HeartbeatFrequency
-# Frequency of heartbeat messages in seconds.
-# Used for monitoring availability of Proxy on server side.
-# 0 - heartbeat messages disabled.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 0-3600
-# Default:
-# HeartbeatFrequency=60
-
-### Option: ConfigFrequency
-# How often proxy retrieves configuration data from Zabbix Server in seconds.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600*24*7
-# Default:
-# ConfigFrequency=3600
-
-### Option: DataSenderFrequency
-# Proxy will send collected data to the Server every N seconds.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# DataSenderFrequency=1
-
-############ ADVANCED PARAMETERS ################
-
-### Option: StartPollers
-# Number of pre-forked instances of pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollers=5
-
-### Option: StartIPMIPollers
-# Number of pre-forked instances of IPMI pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartIPMIPollers=0
-
-### Option: StartPollersUnreachable
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollersUnreachable=1
-
-### Option: StartTrappers
-# Number of pre-forked instances of trappers.
-# Trappers accept incoming connections from Zabbix sender and active agents.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartTrappers=5
-
-### Option: StartPingers
-# Number of pre-forked instances of ICMP pingers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPingers=1
-
-### Option: StartDiscoverers
-# Number of pre-forked instances of discoverers.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartDiscoverers=1
-
-### Option: StartHTTPPollers
-# Number of pre-forked instances of HTTP pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartHTTPPollers=1
-
-### Option: JavaGateway
-# IP address (or hostname) of Zabbix Java gateway.
-# Only required if Java pollers are started.
-#
-# Mandatory: no
-# Default:
-# JavaGateway=
-
-### Option: JavaGatewayPort
-# Port that Zabbix Java gateway listens on.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# JavaGatewayPort=10052
-
-### Option: StartJavaPollers
-# Number of pre-forked instances of Java pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartJavaPollers=0
-
-### Option: StartVMwareCollectors
-# Number of pre-forked vmware collector instances.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartVMwareCollectors=0
-
-### Option: VMwareFrequency
-# How often Zabbix will connect to VMware service to obtain a new data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwareFrequency=60
-
-### Option: VMwareCacheSize
-# Size of VMware cache, in bytes.
-# Shared memory size for storing VMware data.
-# Only used if VMware collectors are started.
-#
-# Mandatory: no
-# Range: 256K-2G
-# Default:
-# VMwareCacheSize=8M
-
-### Option: SNMPTrapperFile
-# Temporary file used for passing data from SNMP trap daemon to the proxy.
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
-#
-# Mandatory: no
-# Default:
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp
-
-### Option: StartSNMPTrapper
-# If 1, SNMP trapper process is started.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# StartSNMPTrapper=0
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the trapper should listen on.
-# Trapper will listen on all network interfaces if this parameter is missing.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: HousekeepingFrequency
-# How often Zabbix will perform housekeeping procedure (in hours).
-# Housekeeping is removing unnecessary information from history, alert, and alarms tables.
-#
-# Mandatory: no
-# Range: 1-24
-# Default:
-# HousekeepingFrequency=1
-
-### Option: CacheSize
-# Size of configuration cache, in bytes.
-# Shared memory size, for storing hosts and items data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# CacheSize=8M
-
-### Option: StartDBSyncers
-# Number of pre-forked instances of DB Syncers
-#
-# Mandatory: no
-# Range: 1-100
-# Default:
-# StartDBSyncers=4
-
-### Option: HistoryCacheSize
-# Size of history cache, in bytes.
-# Shared memory size for storing history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryCacheSize=8M
-
-### Option: HistoryTextCacheSize
-# Size of text history cache, in bytes.
-# Shared memory size for storing character, text or log history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryTextCacheSize=16M
-
-### Option: Timeout
-# Specifies how long we wait for agent, SNMP device or external check (in seconds).
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: TrapperTimeout
-# Specifies how many seconds trapper may spend processing new data.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# TrapperTimeout=300
-
-### Option: UnreachablePeriod
-# After how many seconds of unreachability treat a host as unavailable.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachablePeriod=45
-
-### Option: UnavailableDelay
-# How often host is checked for availability during the unavailability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnavailableDelay=60
-
-### Option: UnreachableDelay
-# How often host is checked for availability during the unreachability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachableDelay=15
-
-### Option: ExternalScripts
-# Full path to location of external scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# ExternalScripts=${datadir}/zabbix/externalscripts
-
-### Option: FpingLocation
-# Location of fping.
-# Make sure that fping binary has root ownership and SUID flag set.
-#
-# Mandatory: no
-# Default:
-# FpingLocation=/usr/sbin/fping
-
-### Option: Fping6Location
-# Location of fping6.
-# Make sure that fping6 binary has root ownership and SUID flag set.
-# Make empty if your fping utility is capable to process IPv6 addresses.
-#
-# Mandatory: no
-# Default:
-# Fping6Location=/usr/sbin/fping6
-
-### Option: SSHKeyLocation
-# Location of public and private keys for SSH checks and actions.
-#
-# Mandatory: no
-# Default:
-# SSHKeyLocation=
-
-### Option: LogSlowQueries
-# How long a database query may take before being logged (in milliseconds).
-# Only works if DebugLevel set to 3 or 4.
-# 0 - don't log slow queries.
-#
-# Mandatory: no
-# Range: 1-3600000
-# Default:
-# LogSlowQueries=0
-
-### Option: TmpDir
-# Temporary directory.
-#
-# Mandatory: no
-# Default:
-# TmpDir=/tmp
-
-### Option: AllowRoot
-# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_proxy.general.conf
-# Include=/usr/local/etc/zabbix_proxy.conf.d/
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of proxy modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at proxy startup. Modules are used to extend functionality of the proxy.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
diff --git a/net-analyzer/zabbix/files/2.2/zabbix_server.conf b/net-analyzer/zabbix/files/2.2/zabbix_server.conf
deleted file mode 100644
index caba0190668..00000000000
--- a/net-analyzer/zabbix/files/2.2/zabbix_server.conf
+++ /dev/null
@@ -1,546 +0,0 @@
-# This is a configuration file for Zabbix Server process
-# To get more information about Zabbix,
-# visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: NodeID
-# Unique NodeID in distributed setup.
-# 0 - standalone server
-#
-# Mandatory: no
-# Range: 0-999
-# Default:
-# NodeID=0
-
-### Option: ListenPort
-# Listen port for trapper.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10051
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: LogFile
-# Name of log file.
-# If not set, syslog is used.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_server.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level
-# 0 - no debug
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-PidFile=/run/zabbix/zabbix_server.pid
-
-### Option: DBHost
-# Database host name.
-# If set to localhost, socket is used for MySQL.
-# If set to empty string, socket is used for PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBHost=localhost
-
-### Option: DBName
-# Database name.
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
-#
-# Mandatory: yes
-# Default:
-# DBName=
-
-DBName=zabbix
-
-### Option: DBSchema
-# Schema name. Used for IBM DB2.
-#
-# Mandatory: no
-# Default:
-# DBSchema=
-
-### Option: DBUser
-# Database user. Ignored for SQLite.
-#
-# Mandatory: no
-# Default:
-# DBUser=
-
-DBUser=root
-
-### Option: DBPassword
-# Database password. Ignored for SQLite.
-# Comment this line if no password is used.
-#
-# Mandatory: no
-# Default:
-# DBPassword=
-
-### Option: DBSocket
-# Path to MySQL socket.
-#
-# Mandatory: no
-# Default:
-# DBSocket=/tmp/mysql.sock
-
-### Option: DBPort
-# Database port when not using local socket. Ignored for SQLite.
-#
-# Mandatory: no
-# Range: 1024-65535
-# Default (for MySQL):
-# DBPort=3306
-
-############ ADVANCED PARAMETERS ################
-
-### Option: StartPollers
-# Number of pre-forked instances of pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollers=5
-
-### Option: StartIPMIPollers
-# Number of pre-forked instances of IPMI pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartIPMIPollers=0
-
-### Option: StartPollersUnreachable
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI).
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollersUnreachable=1
-
-### Option: StartTrappers
-# Number of pre-forked instances of trappers.
-# Trappers accept incoming connections from Zabbix sender, active agents, active proxies and child nodes.
-# At least one trapper process must be running to display server availability in the frontend.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartTrappers=5
-
-### Option: StartPingers
-# Number of pre-forked instances of ICMP pingers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPingers=1
-
-### Option: StartDiscoverers
-# Number of pre-forked instances of discoverers.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartDiscoverers=1
-
-### Option: StartHTTPPollers
-# Number of pre-forked instances of HTTP pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartHTTPPollers=1
-
-### Option: StartTimers
-# Number of pre-forked instances of timers.
-# Timers process time-based trigger functions and maintenance periods.
-# Only the first timer process handles the maintenance periods.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# StartTimers=1
-
-### Option: JavaGateway
-# IP address (or hostname) of Zabbix Java gateway.
-# Only required if Java pollers are started.
-#
-# Mandatory: no
-# Default:
-# JavaGateway=
-
-### Option: JavaGatewayPort
-# Port that Zabbix Java gateway listens on.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# JavaGatewayPort=10052
-
-### Option: StartJavaPollers
-# Number of pre-forked instances of Java pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartJavaPollers=0
-
-### Option: StartVMwareCollectors
-# Number of pre-forked vmware collector instances.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartVMwareCollectors=0
-
-### Option: VMwareFrequency
-# How often Zabbix will connect to VMware service to obtain a new data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwareFrequency=60
-
-### Option: VMwareCacheSize
-# Size of VMware cache, in bytes.
-# Shared memory size for storing VMware data.
-# Only used if VMware collectors are started.
-#
-# Mandatory: no
-# Range: 256K-2G
-# Default:
-# VMwareCacheSize=8M
-
-### Option: SNMPTrapperFile
-# Temporary file used for passing data from SNMP trap daemon to the server.
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
-#
-# Mandatory: no
-# Default:
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp
-
-### Option: StartSNMPTrapper
-# If 1, SNMP trapper process is started.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# StartSNMPTrapper=0
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the trapper should listen on.
-# Trapper will listen on all network interfaces if this parameter is missing.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-# ListenIP=127.0.0.1
-
-### Option: HousekeepingFrequency
-# How often Zabbix will perform housekeeping procedure (in hours).
-# Housekeeping is removing unnecessary information from history, alert, and alarms tables.
-#
-# Mandatory: no
-# Range: 1-24
-# Default:
-# HousekeepingFrequency=1
-
-### Option: MaxHousekeeperDelete
-# The table "housekeeper" contains "tasks" for housekeeping procedure in the format:
-# [housekeeperid], [tablename], [field], [value].
-# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value])
-# will be deleted per one task in one housekeeping cycle.
-# SQLite3 does not use this parameter, deletes all corresponding rows without a limit.
-# If set to 0 then no limit is used at all. In this case you must know what you are doing!
-#
-# Mandatory: no
-# Range: 0-1000000
-# Default:
-# MaxHousekeeperDelete=500
-
-### Option: SenderFrequency
-# How often Zabbix will try to send unsent alerts (in seconds).
-#
-# Mandatory: no
-# Range: 5-3600
-# Default:
-# SenderFrequency=30
-
-### Option: CacheSize
-# Size of configuration cache, in bytes.
-# Shared memory size for storing host, item and trigger data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# CacheSize=8M
-
-### Option: CacheUpdateFrequency
-# How often Zabbix will perform update of configuration cache, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# CacheUpdateFrequency=60
-
-### Option: StartDBSyncers
-# Number of pre-forked instances of DB Syncers
-#
-# Mandatory: no
-# Range: 1-100
-# Default:
-# StartDBSyncers=4
-
-### Option: HistoryCacheSize
-# Size of history cache, in bytes.
-# Shared memory size for storing history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryCacheSize=8M
-
-### Option: TrendCacheSize
-# Size of trend cache, in bytes.
-# Shared memory size for storing trends data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# TrendCacheSize=4M
-
-### Option: HistoryTextCacheSize
-# Size of text history cache, in bytes.
-# Shared memory size for storing character, text or log history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryTextCacheSize=16M
-
-### Option: ValueCacheSize
-# Size of history value cache, in bytes.
-# Shared memory size for caching item history data requests
-# Setting to 0 disables value cache.
-#
-# Mandatory: no
-# Range: 0,128K-64G
-# Default:
-# ValueCacheSize=8M
-
-### Option: NodeNoEvents
-# If set to '1' local events won't be sent to master node.
-# This won't impact ability of this node to propagate events from its child nodes.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# NodeNoEvents=0
-
-### Option: NodeNoHistory
-# If set to '1' local history won't be sent to master node.
-# This won't impact ability of this node to propagate history from its child nodes.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# NodeNoHistory=0
-
-### Option: Timeout
-# Specifies how long we wait for agent, SNMP device or external check (in seconds).
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: TrapperTimeout
-# Specifies how many seconds trapper may spend processing new data.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# TrapperTimeout=300
-
-### Option: UnreachablePeriod
-# After how many seconds of unreachability treat a host as unavailable.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachablePeriod=45
-
-### Option: UnavailableDelay
-# How often host is checked for availability during the unavailability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnavailableDelay=60
-
-### Option: UnreachableDelay
-# How often host is checked for availability during the unreachability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachableDelay=15
-
-### Option: AlertScriptsPath
-# Full path to location of custom alert scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-AlertScriptsPath=/var/lib/zabbix/alertscripts
-
-### Option: ExternalScripts
-# Full path to location of external scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-ExternalScripts=/var/lib/zabbix/externalscripts
-
-### Option: FpingLocation
-# Location of fping.
-# Make sure that fping binary has root ownership and SUID flag set.
-#
-# Mandatory: no
-# Default:
-# FpingLocation=/usr/sbin/fping
-
-### Option: Fping6Location
-# Location of fping6.
-# Make sure that fping6 binary has root ownership and SUID flag set.
-# Make empty if your fping utility is capable to process IPv6 addresses.
-#
-# Mandatory: no
-# Default:
-# Fping6Location=/usr/sbin/fping6
-
-### Option: SSHKeyLocation
-# Location of public and private keys for SSH checks and actions.
-#
-# Mandatory: no
-# Default:
-# SSHKeyLocation=
-
-### Option: LogSlowQueries
-# How long a database query may take before being logged (in milliseconds).
-# Only works if DebugLevel set to 3 or 4.
-# 0 - don't log slow queries.
-#
-# Mandatory: no
-# Range: 1-3600000
-# Default:
-# LogSlowQueries=0
-
-### Option: TmpDir
-# Temporary directory.
-#
-# Mandatory: no
-# Default:
-# TmpDir=/tmp
-
-### Option: StartProxyPollers
-# Number of pre-forked instances of pollers for passive proxies.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartProxyPollers=1
-
-### Option: ProxyConfigFrequency
-# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds.
-# This parameter is used only for proxies in the passive mode.
-#
-# Mandatory: no
-# Range: 1-3600*24*7
-# Default:
-# ProxyConfigFrequency=3600
-
-### Option: ProxyDataFrequency
-# How often Zabbix Server requests history data from a Zabbix Proxy in seconds.
-# This parameter is used only for proxies in the passive mode.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# ProxyDataFrequency=1
-
-### Option: AllowRoot
-# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server
-# will try to switch to user 'zabbix' instead. Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_server.general.conf
-#Include=/etc/zabbix/zabbix_server.conf.d/
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of server modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at server startup. Modules are used to extend functionality of the server.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd b/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
deleted file mode 100755
index d803d4450ca..00000000000
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-agentd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_agentd.pid"
-
-depend() {
- need net
- provide zabbix-agent
- use zabbix-server
-}
-
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix agent"
- start-stop-daemon --start --pidfile ${pid_file} \
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd -- -c /etc/zabbix/zabbix_agentd.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix agent"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy b/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
deleted file mode 100755
index 6aa1793435c..00000000000
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-proxy
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_proxy.pid"
-
-depend() {
- need net
- provide zabbix-proxy
-}
-
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix proxy"
- start-stop-daemon --start --pidfile ${pid_file} \
- --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy -- -c /etc/zabbix/zabbix_proxy.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix proxy"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server b/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
deleted file mode 100755
index 109c6545d45..00000000000
--- a/net-analyzer/zabbix/files/3.0/init.d/zabbix-server
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-pid_file="/run/zabbix/zabbix_server.pid"
-
-depend() {
- need net
- use mysql postgresql
-}
-start_pre() {
- checkpath -d -m 0775 -o zabbix:zabbix /run/zabbix
-}
-
-start() {
- ebegin "Starting Zabbix server"
- start-stop-daemon --start --user zabbix --group zabbix --pidfile ${pid_file} \
- --exec /usr/sbin/zabbix_server -- -c /etc/zabbix/zabbix_server.conf
- eend $?
-}
-
-stop() {
- ebegin "Stopping Zabbix server"
- start-stop-daemon --stop --pidfile ${pid_file}
- eend $?
-}
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf b/net-analyzer/zabbix/files/3.0/zabbix_agent.conf
deleted file mode 100644
index dcb4b7248c2..00000000000
--- a/net-analyzer/zabbix/files/3.0/zabbix_agent.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-# This is a config file for Zabbix internet service daemon agent
-# To get more information about Zabbix visit http://www.zabbix.com
-
-### Option: Server
-# IP address of Zabbix server
-# Connections from other hosts will be denied
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
-#
-# Mandatory: yes
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-############ ADVANCED PARAMETERS #################
-
-### Option: Alias
-# Sets an alias for parameter. It can be useful to substitute long and complex parameter name with a smaller and simpler one.
-#
-# Mandatory: no
-# Range:
-# Default:
-
-### Option: Timeout
-# Spend no more than Timeout seconds on processing
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_agent.userparams.conf
-# Include=/usr/local/etc/zabbix_agent.conf.d/
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-# Allow all characters to be passed in arguments to user-defined parameters.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# UnsafeUserParameters=0
-
-### Option: UserParameter
-# User-defined parameter to monitor. There can be several user-defined parameters.
-# Format: UserParameter=<key>,<shell command>
-# See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of agent modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at agent startup. Modules are used to extend functionality of the agent.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf b/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf
deleted file mode 100644
index 5ff17ce33d6..00000000000
--- a/net-analyzer/zabbix/files/3.0/zabbix_agentd.conf
+++ /dev/null
@@ -1,390 +0,0 @@
-# This is a configuration file for Zabbix agent daemon (Unix)
-# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_agentd.pid
-PidFile=/run/zabbix/zabbix_agentd.pid
-
-### Option: LogType
-# Specifies where log messages are written to:
-# system - syslog
-# file - file specified with LogFile parameter
-# console - standard output
-#
-# Mandatory: no
-# Default:
-# LogType=file
-
-### Option: LogFile
-# Log file name for LogType 'file' parameter.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_agentd.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-# LogFileSize=1
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level:
-# 0 - basic information about starting and stopping of Zabbix processes
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-# 5 - extended debugging (produces even more information)
-#
-# Mandatory: no
-# Range: 0-5
-# Default:
-# DebugLevel=3
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: EnableRemoteCommands
-# Whether remote commands from Zabbix server are allowed.
-# 0 - not allowed
-# 1 - allowed
-#
-# Mandatory: no
-# Default:
-# EnableRemoteCommands=0
-
-### Option: LogRemoteCommands
-# Enable logging of executed shell commands as warnings.
-# 0 - disabled
-# 1 - enabled
-#
-# Mandatory: no
-# Default:
-# LogRemoteCommands=0
-
-##### Passive checks related
-
-### Option: Server
-# List of comma delimited IP addresses (or hostnames) of Zabbix servers.
-# Incoming connections will be accepted only from the hosts listed here.
-# If IPv6 support is enabled then '127.0.0.1', '::127.0.0.1', '::ffff:127.0.0.1' are treated equally.
-#
-# Mandatory: no
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-### Option: ListenPort
-# Agent will listen on this port for connections from the server.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10050
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the agent should listen on.
-# First IP address is sent to Zabbix server if connecting to it to retrieve list of active checks.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: StartAgents
-# Number of pre-forked instances of zabbix_agentd that process passive checks.
-# If set to 0, disables passive checks and the agent will not listen on any TCP port.
-#
-# Mandatory: no
-# Range: 0-100
-# Default:
-# StartAgents=3
-
-##### Active checks related
-
-### Option: ServerActive
-# List of comma delimited IP:port (or hostname:port) pairs of Zabbix servers for active checks.
-# If port is not specified, default port is used.
-# IPv6 addresses must be enclosed in square brackets if port for that host is specified.
-# If port is not specified, square brackets for IPv6 addresses are optional.
-# If this parameter is not specified, active checks are disabled.
-# Example: ServerActive=127.0.0.1:20051,zabbix.domain,[::1]:30051,::1,[12fc::1]
-#
-# Mandatory: no
-# Default:
-# ServerActive=
-
-ServerActive=127.0.0.1
-
-### Option: Hostname
-# Unique, case sensitive hostname.
-# Required for active checks and must match hostname as configured on the server.
-# Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=Zabbix server
-
-### Option: HostnameItem
-# Item used for generating Hostname if it is undefined. Ignored if Hostname is defined.
-# Does not support UserParameters or aliases.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: HostMetadata
-# Optional parameter that defines host metadata.
-# Host metadata is used at host auto-registration process.
-# An agent will issue an error and not start if the value is over limit of 255 characters.
-# If not defined, value will be acquired from HostMetadataItem.
-#
-# Mandatory: no
-# Range: 0-255 characters
-# Default:
-# HostMetadata=
-
-### Option: HostMetadataItem
-# Optional parameter that defines an item used for getting host metadata.
-# Host metadata is used at host auto-registration process.
-# During an auto-registration request an agent will log a warning message if
-# the value returned by specified item is over limit of 255 characters.
-# This option is only used when HostMetadata is not defined.
-#
-# Mandatory: no
-# Default:
-# HostMetadataItem=
-
-### Option: RefreshActiveChecks
-# How often list of active checks is refreshed, in seconds.
-#
-# Mandatory: no
-# Range: 60-3600
-# Default:
-# RefreshActiveChecks=120
-
-### Option: BufferSend
-# Do not keep data longer than N seconds in buffer.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# BufferSend=5
-
-### Option: BufferSize
-# Maximum number of values in a memory buffer. The agent will send
-# all collected data to Zabbix Server or Proxy if the buffer is full.
-#
-# Mandatory: no
-# Range: 2-65535
-# Default:
-# BufferSize=100
-
-### Option: MaxLinesPerSecond
-# Maximum number of new lines the agent will send per second to Zabbix Server
-# or Proxy processing 'log' and 'logrt' active checks.
-# The provided value will be overridden by the parameter 'maxlines',
-# provided in 'log' or 'logrt' item keys.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# MaxLinesPerSecond=20
-
-############ ADVANCED PARAMETERS #################
-
-### Option: Alias
-# Sets an alias for an item key. It can be used to substitute long and complex item key with a smaller and simpler one.
-# Multiple Alias parameters may be present. Multiple parameters with the same Alias key are not allowed.
-# Different Alias keys may reference the same item key.
-# For example, to retrieve the ID of user 'zabbix':
-# Alias=zabbix.userid:vfs.file.regexp[/etc/passwd,^zabbix:.:([0-9]+),,,,\1]
-# Now shorthand key zabbix.userid may be used to retrieve data.
-# Aliases can be used in HostMetadataItem but not in HostnameItem parameters.
-#
-# Mandatory: no
-# Range:
-# Default:
-
-### Option: Timeout
-# Spend no more than Timeout seconds on processing
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-### Option: AllowRoot
-# Allow the agent to run as 'root'. If disabled and the agent is started by 'root', the agent
-# will try to switch to the user specified by the User configuration option instead.
-# Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: User
-# Drop privileges to a specific, existing user on the system.
-# Only has effect if run as 'root' and AllowRoot is disabled.
-#
-# Mandatory: no
-# Default:
-# User=zabbix
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_agentd.userparams.conf
-# Include=/usr/local/etc/zabbix_agentd.conf.d/
-# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
-
-####### USER-DEFINED MONITORED PARAMETERS #######
-
-### Option: UnsafeUserParameters
-# Allow all characters to be passed in arguments to user-defined parameters.
-# The following characters are not allowed:
-# \ ' " ` * ? [ ] { } ~ $ ! & ; ( ) < > | # @
-# Additionally, newline characters are not allowed.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# UnsafeUserParameters=0
-
-### Option: UserParameter
-# User-defined parameter to monitor. There can be several user-defined parameters.
-# Format: UserParameter=<key>,<shell command>
-# See 'zabbix_agentd' directory for examples.
-#
-# Mandatory: no
-# Default:
-# UserParameter=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of agent modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at agent startup. Modules are used to extend functionality of the agent.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
-
-####### TLS-RELATED PARAMETERS #######
-
-### Option: TLSConnect
-# How the agent should connect to server or proxy. Used for active checks.
-# Only one value can be specified:
-# unencrypted - connect without encryption
-# psk - connect using TLS and a pre-shared key
-# cert - connect using TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSConnect=unencrypted
-
-### Option: TLSAccept
-# What incoming connections to accept.
-# Multiple values can be specified, separated by comma:
-# unencrypted - accept connections without encryption
-# psk - accept connections secured with TLS and a pre-shared key
-# cert - accept connections secured with TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSAccept=unencrypted
-
-### Option: TLSCAFile
-# Full pathname of a file containing the top-level CA(s) certificates for
-# peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# TLSCAFile=
-
-### Option: TLSCRLFile
-# Full pathname of a file containing revoked certificates.
-#
-# Mandatory: no
-# Default:
-# TLSCRLFile=
-
-### Option: TLSServerCertIssuer
-# Allowed server certificate issuer.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertIssuer=
-
-### Option: TLSServerCertSubject
-# Allowed server certificate subject.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertSubject=
-
-### Option: TLSCertFile
-# Full pathname of a file containing the agent certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# TLSCertFile=
-
-### Option: TLSKeyFile
-# Full pathname of a file containing the agent private key.
-#
-# Mandatory: no
-# Default:
-# TLSKeyFile=
-
-### Option: TLSPSKIdentity
-# Unique, case sensitive string used to identify the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKIdentity=
-
-### Option: TLSPSKFile
-# Full pathname of a file containing the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKFile=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf b/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf
deleted file mode 100644
index f96b0d01f51..00000000000
--- a/net-analyzer/zabbix/files/3.0/zabbix_proxy.conf
+++ /dev/null
@@ -1,674 +0,0 @@
-# This is a configuration file for Zabbix proxy daemon
-# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: ProxyMode
-# Proxy operating mode.
-# 0 - proxy in the active mode
-# 1 - proxy in the passive mode
-#
-# Mandatory: no
-# Default:
-# ProxyMode=0
-
-### Option: Server
-# IP address (or hostname) of Zabbix server.
-# Active proxy will get configuration data from the server.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: yes (if ProxyMode is set to 0)
-# Default:
-# Server=
-
-Server=127.0.0.1
-
-### Option: ServerPort
-# Port of Zabbix trapper on Zabbix server.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ServerPort=10051
-
-### Option: Hostname
-# Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server!
-# Value is acquired from HostnameItem if undefined.
-#
-# Mandatory: no
-# Default:
-# Hostname=
-
-Hostname=Zabbix proxy
-
-### Option: HostnameItem
-# Item used for generating Hostname if it is undefined.
-# Ignored if Hostname is defined.
-#
-# Mandatory: no
-# Default:
-# HostnameItem=system.hostname
-
-### Option: ListenPort
-# Listen port for trapper.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10051
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: LogType
-# Specifies where log messages are written to:
-# system - syslog
-# file - file specified with LogFile parameter
-# console - standard output
-#
-# Mandatory: no
-# Default:
-# LogType=file
-
-### Option: LogFile
-# Log file name for LogType 'file' parameter.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_proxy.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-# LogFileSize=1
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level:
-# 0 - basic information about starting and stopping of Zabbix processes
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-# 5 - extended debugging (produces even more information)
-#
-# Mandatory: no
-# Range: 0-5
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_proxy.pid
-PidFile=/run/zabbix/zabbix_proxy.pid
-
-### Option: DBHost
-# Database host name.
-# If set to localhost, socket is used for MySQL.
-# If set to empty string, socket is used for PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBHost=localhost
-
-### Option: DBName
-# Database name.
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
-# Warning: do not attempt to use the same database Zabbix server is using.
-#
-# Mandatory: yes
-# Default:
-# DBName=
-
-DBName=zabbix_proxy
-
-### Option: DBSchema
-# Schema name. Used for IBM DB2 and PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBSchema=
-
-### Option: DBUser
-# Database user. Ignored for SQLite.
-#
-# Default:
-# DBUser=
-
-DBUser=zabbix
-
-### Option: DBPassword
-# Database password. Ignored for SQLite.
-# Comment this line if no password is used.
-#
-# Mandatory: no
-# Default:
-# DBPassword=
-
-### Option: DBSocket
-# Path to MySQL socket.
-#
-# Mandatory: no
-# Default:
-# DBSocket=/tmp/mysql.sock
-
-# Option: DBPort
-# Database port when not using local socket. Ignored for SQLite.
-#
-# Mandatory: no
-# Default (for MySQL):
-# DBPort=3306
-
-######### PROXY SPECIFIC PARAMETERS #############
-
-### Option: ProxyLocalBuffer
-# Proxy will keep data locally for N hours, even if the data have already been synced with the server.
-# This parameter may be used if local data will be used by third party applications.
-#
-# Mandatory: no
-# Range: 0-720
-# Default:
-# ProxyLocalBuffer=0
-
-### Option: ProxyOfflineBuffer
-# Proxy will keep data for N hours in case if no connectivity with Zabbix Server.
-# Older data will be lost.
-#
-# Mandatory: no
-# Range: 1-720
-# Default:
-# ProxyOfflineBuffer=1
-
-### Option: HeartbeatFrequency
-# Frequency of heartbeat messages in seconds.
-# Used for monitoring availability of Proxy on server side.
-# 0 - heartbeat messages disabled.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 0-3600
-# Default:
-# HeartbeatFrequency=60
-
-### Option: ConfigFrequency
-# How often proxy retrieves configuration data from Zabbix Server in seconds.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600*24*7
-# Default:
-# ConfigFrequency=3600
-
-### Option: DataSenderFrequency
-# Proxy will send collected data to the Server every N seconds.
-# For a proxy in the passive mode this parameter will be ignored.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# DataSenderFrequency=1
-
-############ ADVANCED PARAMETERS ################
-
-### Option: StartPollers
-# Number of pre-forked instances of pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollers=5
-
-### Option: StartIPMIPollers
-# Number of pre-forked instances of IPMI pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartIPMIPollers=0
-
-### Option: StartPollersUnreachable
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
-# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
-# are started.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollersUnreachable=1
-
-### Option: StartTrappers
-# Number of pre-forked instances of trappers.
-# Trappers accept incoming connections from Zabbix sender and active agents.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartTrappers=5
-
-### Option: StartPingers
-# Number of pre-forked instances of ICMP pingers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPingers=1
-
-### Option: StartDiscoverers
-# Number of pre-forked instances of discoverers.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartDiscoverers=1
-
-### Option: StartHTTPPollers
-# Number of pre-forked instances of HTTP pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartHTTPPollers=1
-
-### Option: JavaGateway
-# IP address (or hostname) of Zabbix Java gateway.
-# Only required if Java pollers are started.
-#
-# Mandatory: no
-# Default:
-# JavaGateway=
-
-### Option: JavaGatewayPort
-# Port that Zabbix Java gateway listens on.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# JavaGatewayPort=10052
-
-### Option: StartJavaPollers
-# Number of pre-forked instances of Java pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartJavaPollers=0
-
-### Option: StartVMwareCollectors
-# Number of pre-forked vmware collector instances.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartVMwareCollectors=0
-
-### Option: VMwareFrequency
-# How often Zabbix will connect to VMware service to obtain a new data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwareFrequency=60
-
-### Option: VMwarePerfFrequency
-# How often Zabbix will connect to VMware service to obtain performance data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwarePerfFrequency=60
-
-### Option: VMwareCacheSize
-# Size of VMware cache, in bytes.
-# Shared memory size for storing VMware data.
-# Only used if VMware collectors are started.
-#
-# Mandatory: no
-# Range: 256K-2G
-# Default:
-# VMwareCacheSize=8M
-
-### Option: VMwareTimeout
-# Specifies how many seconds vmware collector waits for response from VMware service.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# VMwareTimeout=10
-
-### Option: SNMPTrapperFile
-# Temporary file used for passing data from SNMP trap daemon to the proxy.
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
-#
-# Mandatory: no
-# Default:
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp
-
-### Option: StartSNMPTrapper
-# If 1, SNMP trapper process is started.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# StartSNMPTrapper=0
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the trapper should listen on.
-# Trapper will listen on all network interfaces if this parameter is missing.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-### Option: HousekeepingFrequency
-# How often Zabbix will perform housekeeping procedure (in hours).
-# Housekeeping is removing outdated information from the database.
-# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency
-# hours of outdated information are deleted in one housekeeping cycle.
-# To lower load on proxy startup housekeeping is postponed for 30 minutes after proxy start.
-# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option.
-# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the
-# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days.
-#
-# Mandatory: no
-# Range: 0-24
-# Default:
-# HousekeepingFrequency=1
-
-### Option: CacheSize
-# Size of configuration cache, in bytes.
-# Shared memory size, for storing hosts and items data.
-#
-# Mandatory: no
-# Range: 128K-8G
-# Default:
-# CacheSize=8M
-
-### Option: StartDBSyncers
-# Number of pre-forked instances of DB Syncers.
-#
-# Mandatory: no
-# Range: 1-100
-# Default:
-# StartDBSyncers=4
-
-### Option: HistoryCacheSize
-# Size of history cache, in bytes.
-# Shared memory size for storing history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryCacheSize=16M
-
-### Option: HistoryIndexCacheSize
-# Size of history index cache, in bytes.
-# Shared memory size for indexing history cache.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryIndexCacheSize=4M
-
-### Option: Timeout
-# Specifies how long we wait for agent, SNMP device or external check (in seconds).
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-Timeout=4
-
-### Option: TrapperTimeout
-# Specifies how many seconds trapper may spend processing new data.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# TrapperTimeout=300
-
-### Option: UnreachablePeriod
-# After how many seconds of unreachability treat a host as unavailable.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachablePeriod=45
-
-### Option: UnavailableDelay
-# How often host is checked for availability during the unavailability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnavailableDelay=60
-
-### Option: UnreachableDelay
-# How often host is checked for availability during the unreachability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachableDelay=15
-
-### Option: ExternalScripts
-# Full path to location of external scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# ExternalScripts=${datadir}/zabbix/externalscripts
-
-### Option: FpingLocation
-# Location of fping.
-# Make sure that fping binary has root ownership and SUID flag set.
-#
-# Mandatory: no
-# Default:
-# FpingLocation=/usr/sbin/fping
-
-### Option: Fping6Location
-# Location of fping6.
-# Make sure that fping6 binary has root ownership and SUID flag set.
-# Make empty if your fping utility is capable to process IPv6 addresses.
-#
-# Mandatory: no
-# Default:
-# Fping6Location=/usr/sbin/fping6
-
-### Option: SSHKeyLocation
-# Location of public and private keys for SSH checks and actions.
-#
-# Mandatory: no
-# Default:
-# SSHKeyLocation=
-
-### Option: LogSlowQueries
-# How long a database query may take before being logged (in milliseconds).
-# Only works if DebugLevel set to 3 or 4.
-# 0 - don't log slow queries.
-#
-# Mandatory: no
-# Range: 1-3600000
-# Default:
-# LogSlowQueries=0
-
-LogSlowQueries=3000
-
-### Option: TmpDir
-# Temporary directory.
-#
-# Mandatory: no
-# Default:
-# TmpDir=/tmp
-
-### Option: AllowRoot
-# Allow the proxy to run as 'root'. If disabled and the proxy is started by 'root', the proxy
-# will try to switch to the user specified by the User configuration option instead.
-# Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: User
-# Drop privileges to a specific, existing user on the system.
-# Only has effect if run as 'root' and AllowRoot is disabled.
-#
-# Mandatory: no
-# Default:
-# User=zabbix
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_proxy.general.conf
-# Include=/usr/local/etc/zabbix_proxy.conf.d/
-# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
-
-### Option: SSLCertLocation
-# Location of SSL client certificates.
-# This parameter is used only in web monitoring.
-#
-# Mandatory: no
-# Default:
-# SSLCertLocation=${datadir}/zabbix/ssl/certs
-
-### Option: SSLKeyLocation
-# Location of private keys for SSL client certificates.
-# This parameter is used only in web monitoring.
-#
-# Mandatory: no
-# Default:
-# SSLKeyLocation=${datadir}/zabbix/ssl/keys
-
-### Option: SSLCALocation
-# Location of certificate authority (CA) files for SSL server certificate verification.
-# If not set, system-wide directory will be used.
-# This parameter is used only in web monitoring.
-#
-# Mandatory: no
-# Default:
-# SSLCALocation=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of proxy modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at proxy startup. Modules are used to extend functionality of the proxy.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
-
-####### TLS-RELATED PARAMETERS #######
-
-### Option: TLSConnect
-# How the proxy should connect to Zabbix server. Used for an active proxy, ignored on a passive proxy.
-# Only one value can be specified:
-# unencrypted - connect without encryption
-# psk - connect using TLS and a pre-shared key
-# cert - connect using TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSConnect=unencrypted
-
-### Option: TLSAccept
-# What incoming connections to accept from Zabbix server. Used for a passive proxy, ignored on an active proxy.
-# Multiple values can be specified, separated by comma:
-# unencrypted - accept connections without encryption
-# psk - accept connections secured with TLS and a pre-shared key
-# cert - accept connections secured with TLS and a certificate
-#
-# Mandatory: yes, if TLS certificate or PSK parameters are defined (even for 'unencrypted' connection)
-# Default:
-# TLSAccept=unencrypted
-
-### Option: TLSCAFile
-# Full pathname of a file containing the top-level CA(s) certificates for
-# peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# TLSCAFile=
-
-### Option: TLSCRLFile
-# Full pathname of a file containing revoked certificates.
-#
-# Mandatory: no
-# Default:
-# TLSCRLFile=
-
-### Option: TLSServerCertIssuer
-# Allowed server certificate issuer.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertIssuer=
-
-### Option: TLSServerCertSubject
-# Allowed server certificate subject.
-#
-# Mandatory: no
-# Default:
-# TLSServerCertSubject=
-
-### Option: TLSCertFile
-# Full pathname of a file containing the proxy certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# TLSCertFile=
-
-### Option: TLSKeyFile
-# Full pathname of a file containing the proxy private key.
-#
-# Mandatory: no
-# Default:
-# TLSKeyFile=
-
-### Option: TLSPSKIdentity
-# Unique, case sensitive string used to identify the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKIdentity=
-
-### Option: TLSPSKFile
-# Full pathname of a file containing the pre-shared key.
-#
-# Mandatory: no
-# Default:
-# TLSPSKFile=
diff --git a/net-analyzer/zabbix/files/3.0/zabbix_server.conf b/net-analyzer/zabbix/files/3.0/zabbix_server.conf
deleted file mode 100644
index 81a4961ee58..00000000000
--- a/net-analyzer/zabbix/files/3.0/zabbix_server.conf
+++ /dev/null
@@ -1,635 +0,0 @@
-# This is a configuration file for Zabbix server daemon
-# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: ListenPort
-# Listen port for trapper.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# ListenPort=10051
-
-### Option: SourceIP
-# Source IP address for outgoing connections.
-#
-# Mandatory: no
-# Default:
-# SourceIP=
-
-### Option: LogType
-# Specifies where log messages are written to:
-# system - syslog
-# file - file specified with LogFile parameter
-# console - standard output
-#
-# Mandatory: no
-# Default:
-# LogType=file
-
-### Option: LogFile
-# Log file name for LogType 'file' parameter.
-#
-# Mandatory: no
-# Default:
-# LogFile=
-
-LogFile=/var/log/zabbix/zabbix_server.log
-
-### Option: LogFileSize
-# Maximum size of log file in MB.
-# 0 - disable automatic log rotation.
-#
-# Mandatory: no
-# Range: 0-1024
-# Default:
-# LogFileSize=1
-LogFileSize=128
-
-### Option: DebugLevel
-# Specifies debug level:
-# 0 - basic information about starting and stopping of Zabbix processes
-# 1 - critical information
-# 2 - error information
-# 3 - warnings
-# 4 - for debugging (produces lots of information)
-# 5 - extended debugging (produces even more information)
-#
-# Mandatory: no
-# Range: 0-5
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-# Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_server.pid
-PidFile=/run/zabbix/zabbix_server.pid
-
-### Option: DBHost
-# Database host name.
-# If set to localhost, socket is used for MySQL.
-# If set to empty string, socket is used for PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBHost=localhost
-
-### Option: DBName
-# Database name.
-# For SQLite3 path to database file must be provided. DBUser and DBPassword are ignored.
-#
-# Mandatory: yes
-# Default:
-# DBName=
-
-DBName=zabbix
-
-### Option: DBSchema
-# Schema name. Used for IBM DB2 and PostgreSQL.
-#
-# Mandatory: no
-# Default:
-# DBSchema=
-
-### Option: DBUser
-# Database user. Ignored for SQLite.
-#
-# Mandatory: no
-# Default:
-# DBUser=
-
-DBUser=zabbix
-
-### Option: DBPassword
-# Database password. Ignored for SQLite.
-# Comment this line if no password is used.
-#
-# Mandatory: no
-# Default:
-# DBPassword=
-
-### Option: DBSocket
-# Path to MySQL socket.
-#
-# Mandatory: no
-# Default:
-# DBSocket=/tmp/mysql.sock
-
-### Option: DBPort
-# Database port when not using local socket. Ignored for SQLite.
-#
-# Mandatory: no
-# Range: 1024-65535
-# Default (for MySQL):
-# DBPort=3306
-
-############ ADVANCED PARAMETERS ################
-
-### Option: StartPollers
-# Number of pre-forked instances of pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollers=5
-
-### Option: StartIPMIPollers
-# Number of pre-forked instances of IPMI pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartIPMIPollers=0
-
-### Option: StartPollersUnreachable
-# Number of pre-forked instances of pollers for unreachable hosts (including IPMI and Java).
-# At least one poller for unreachable hosts must be running if regular, IPMI or Java pollers
-# are started.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPollersUnreachable=1
-
-### Option: StartTrappers
-# Number of pre-forked instances of trappers.
-# Trappers accept incoming connections from Zabbix sender, active agents and active proxies.
-# At least one trapper process must be running to display server availability and view queue
-# in the frontend.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartTrappers=5
-
-### Option: StartPingers
-# Number of pre-forked instances of ICMP pingers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartPingers=1
-
-### Option: StartDiscoverers
-# Number of pre-forked instances of discoverers.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartDiscoverers=1
-
-### Option: StartHTTPPollers
-# Number of pre-forked instances of HTTP pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartHTTPPollers=1
-
-### Option: StartTimers
-# Number of pre-forked instances of timers.
-# Timers process time-based trigger functions and maintenance periods.
-# Only the first timer process handles the maintenance periods.
-#
-# Mandatory: no
-# Range: 1-1000
-# Default:
-# StartTimers=1
-
-### Option: StartEscalators
-# Number of pre-forked instances of escalators.
-#
-# Mandatory: no
-# Range: 0-100
-# Default:
-# StartEscalators=1
-
-### Option: JavaGateway
-# IP address (or hostname) of Zabbix Java gateway.
-# Only required if Java pollers are started.
-#
-# Mandatory: no
-# Default:
-# JavaGateway=
-
-### Option: JavaGatewayPort
-# Port that Zabbix Java gateway listens on.
-#
-# Mandatory: no
-# Range: 1024-32767
-# Default:
-# JavaGatewayPort=10052
-
-### Option: StartJavaPollers
-# Number of pre-forked instances of Java pollers.
-#
-# Mandatory: no
-# Range: 0-1000
-# Default:
-# StartJavaPollers=0
-
-### Option: StartVMwareCollectors
-# Number of pre-forked vmware collector instances.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartVMwareCollectors=0
-
-### Option: VMwareFrequency
-# How often Zabbix will connect to VMware service to obtain a new data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwareFrequency=60
-
-### Option: VMwarePerfFrequency
-# How often Zabbix will connect to VMware service to obtain performance data.
-#
-# Mandatory: no
-# Range: 10-86400
-# Default:
-# VMwarePerfFrequency=60
-
-### Option: VMwareCacheSize
-# Size of VMware cache, in bytes.
-# Shared memory size for storing VMware data.
-# Only used if VMware collectors are started.
-#
-# Mandatory: no
-# Range: 256K-2G
-# Default:
-# VMwareCacheSize=8M
-
-### Option: VMwareTimeout
-# Specifies how many seconds vmware collector waits for response from VMware service.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# VMwareTimeout=10
-
-### Option: SNMPTrapperFile
-# Temporary file used for passing data from SNMP trap daemon to the server.
-# Must be the same as in zabbix_trap_receiver.pl or SNMPTT configuration file.
-#
-# Mandatory: no
-# Default:
-# SNMPTrapperFile=/tmp/zabbix_traps.tmp
-
-### Option: StartSNMPTrapper
-# If 1, SNMP trapper process is started.
-#
-# Mandatory: no
-# Range: 0-1
-# Default:
-# StartSNMPTrapper=0
-
-### Option: ListenIP
-# List of comma delimited IP addresses that the trapper should listen on.
-# Trapper will listen on all network interfaces if this parameter is missing.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-# ListenIP=127.0.0.1
-
-### Option: HousekeepingFrequency
-# How often Zabbix will perform housekeeping procedure (in hours).
-# Housekeeping is removing outdated information from the database.
-# To prevent Housekeeper from being overloaded, no more than 4 times HousekeepingFrequency
-# hours of outdated information are deleted in one housekeeping cycle, for each item.
-# To lower load on server startup housekeeping is postponed for 30 minutes after server start.
-# With HousekeepingFrequency=0 the housekeeper can be only executed using the runtime control option.
-# In this case the period of outdated information deleted in one housekeeping cycle is 4 times the
-# period since the last housekeeping cycle, but not less than 4 hours and not greater than 4 days.
-#
-# Mandatory: no
-# Range: 0-24
-# Default:
-# HousekeepingFrequency=1
-
-### Option: MaxHousekeeperDelete
-# The table "housekeeper" contains "tasks" for housekeeping procedure in the format:
-# [housekeeperid], [tablename], [field], [value].
-# No more than 'MaxHousekeeperDelete' rows (corresponding to [tablename], [field], [value])
-# will be deleted per one task in one housekeeping cycle.
-# SQLite3 does not use this parameter, deletes all corresponding rows without a limit.
-# If set to 0 then no limit is used at all. In this case you must know what you are doing!
-#
-# Mandatory: no
-# Range: 0-1000000
-# Default:
-# MaxHousekeeperDelete=5000
-
-### Option: SenderFrequency
-# How often Zabbix will try to send unsent alerts (in seconds).
-#
-# Mandatory: no
-# Range: 5-3600
-# Default:
-# SenderFrequency=30
-
-### Option: CacheSize
-# Size of configuration cache, in bytes.
-# Shared memory size for storing host, item and trigger data.
-#
-# Mandatory: no
-# Range: 128K-8G
-# Default:
-# CacheSize=8M
-
-### Option: CacheUpdateFrequency
-# How often Zabbix will perform update of configuration cache, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# CacheUpdateFrequency=60
-
-### Option: StartDBSyncers
-# Number of pre-forked instances of DB Syncers.
-#
-# Mandatory: no
-# Range: 1-100
-# Default:
-# StartDBSyncers=4
-
-### Option: HistoryCacheSize
-# Size of history cache, in bytes.
-# Shared memory size for storing history data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryCacheSize=16M
-
-### Option: HistoryIndexCacheSize
-# Size of history index cache, in bytes.
-# Shared memory size for indexing history cache.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# HistoryIndexCacheSize=4M
-
-### Option: TrendCacheSize
-# Size of trend cache, in bytes.
-# Shared memory size for storing trends data.
-#
-# Mandatory: no
-# Range: 128K-2G
-# Default:
-# TrendCacheSize=4M
-
-### Option: ValueCacheSize
-# Size of history value cache, in bytes.
-# Shared memory size for caching item history data requests.
-# Setting to 0 disables value cache.
-#
-# Mandatory: no
-# Range: 0,128K-64G
-# Default:
-# ValueCacheSize=8M
-
-### Option: Timeout
-# Specifies how long we wait for agent, SNMP device or external check (in seconds).
-#
-# Mandatory: no
-# Range: 1-30
-# Default:
-# Timeout=3
-
-Timeout=4
-
-### Option: TrapperTimeout
-# Specifies how many seconds trapper may spend processing new data.
-#
-# Mandatory: no
-# Range: 1-300
-# Default:
-# TrapperTimeout=300
-
-### Option: UnreachablePeriod
-# After how many seconds of unreachability treat a host as unavailable.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachablePeriod=45
-
-### Option: UnavailableDelay
-# How often host is checked for availability during the unavailability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnavailableDelay=60
-
-### Option: UnreachableDelay
-# How often host is checked for availability during the unreachability period, in seconds.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# UnreachableDelay=15
-
-### Option: AlertScriptsPath
-# Full path to location of custom alert scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# AlertScriptsPath=${datadir}/zabbix/alertscripts
-AlertScriptsPath=/var/lib/zabbix/alertscripts
-
-### Option: ExternalScripts
-# Full path to location of external scripts.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# ExternalScripts=${datadir}/zabbix/externalscripts
-ExternalScripts=/var/lib/zabbix/externalscripts
-
-### Option: FpingLocation
-# Location of fping.
-# Make sure that fping binary has root ownership and SUID flag set.
-#
-# Mandatory: no
-# Default:
-# FpingLocation=/usr/sbin/fping
-
-### Option: Fping6Location
-# Location of fping6.
-# Make sure that fping6 binary has root ownership and SUID flag set.
-# Make empty if your fping utility is capable to process IPv6 addresses.
-#
-# Mandatory: no
-# Default:
-# Fping6Location=/usr/sbin/fping6
-
-### Option: SSHKeyLocation
-# Location of public and private keys for SSH checks and actions.
-#
-# Mandatory: no
-# Default:
-# SSHKeyLocation=
-
-### Option: LogSlowQueries
-# How long a database query may take before being logged (in milliseconds).
-# Only works if DebugLevel set to 3, 4 or 5.
-# 0 - don't log slow queries.
-#
-# Mandatory: no
-# Range: 1-3600000
-# Default:
-# LogSlowQueries=0
-
-LogSlowQueries=3000
-
-### Option: TmpDir
-# Temporary directory.
-#
-# Mandatory: no
-# Default:
-# TmpDir=/tmp
-
-### Option: StartProxyPollers
-# Number of pre-forked instances of pollers for passive proxies.
-#
-# Mandatory: no
-# Range: 0-250
-# Default:
-# StartProxyPollers=1
-
-### Option: ProxyConfigFrequency
-# How often Zabbix Server sends configuration data to a Zabbix Proxy in seconds.
-# This parameter is used only for proxies in the passive mode.
-#
-# Mandatory: no
-# Range: 1-3600*24*7
-# Default:
-# ProxyConfigFrequency=3600
-
-### Option: ProxyDataFrequency
-# How often Zabbix Server requests history data from a Zabbix Proxy in seconds.
-# This parameter is used only for proxies in the passive mode.
-#
-# Mandatory: no
-# Range: 1-3600
-# Default:
-# ProxyDataFrequency=1
-
-### Option: AllowRoot
-# Allow the server to run as 'root'. If disabled and the server is started by 'root', the server
-# will try to switch to the user specified by the User configuration option instead.
-# Has no effect if started under a regular user.
-# 0 - do not allow
-# 1 - allow
-#
-# Mandatory: no
-# Default:
-# AllowRoot=0
-
-### Option: User
-# Drop privileges to a specific, existing user on the system.
-# Only has effect if run as 'root' and AllowRoot is disabled.
-#
-# Mandatory: no
-# Default:
-# User=zabbix
-
-### Option: Include
-# You may include individual files or all files in a directory in the configuration file.
-# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/usr/local/etc/zabbix_server.general.conf
-# Include=/usr/local/etc/zabbix_server.conf.d/
-# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
-
-### Option: SSLCertLocation
-# Location of SSL client certificates.
-# This parameter is used only in web monitoring.
-#
-# Mandatory: no
-# Default:
-# SSLCertLocation=${datadir}/zabbix/ssl/certs
-
-### Option: SSLKeyLocation
-# Location of private keys for SSL client certificates.
-# This parameter is used only in web monitoring.
-#
-# Mandatory: no
-# Default:
-# SSLKeyLocation=${datadir}/zabbix/ssl/keys
-
-### Option: SSLCALocation
-# Override the location of certificate authority (CA) files for SSL server certificate verification.
-# If not set, system-wide directory will be used.
-# This parameter is used only in web monitoring and SMTP authentication.
-#
-# Mandatory: no
-# Default:
-# SSLCALocation=
-
-####### LOADABLE MODULES #######
-
-### Option: LoadModulePath
-# Full path to location of server modules.
-# Default depends on compilation options.
-#
-# Mandatory: no
-# Default:
-# LoadModulePath=${libdir}/modules
-
-### Option: LoadModule
-# Module to load at server startup. Modules are used to extend functionality of the server.
-# Format: LoadModule=<module.so>
-# The modules must be located in directory specified by LoadModulePath.
-# It is allowed to include multiple LoadModule parameters.
-#
-# Mandatory: no
-# Default:
-# LoadModule=
-
-####### TLS-RELATED PARAMETERS #######
-
-### Option: TLSCAFile
-# Full pathname of a file containing the top-level CA(s) certificates for
-# peer certificate verification.
-#
-# Mandatory: no
-# Default:
-# TLSCAFile=
-
-### Option: TLSCRLFile
-# Full pathname of a file containing revoked certificates.
-#
-# Mandatory: no
-# Default:
-# TLSCRLFile=
-
-### Option: TLSCertFile
-# Full pathname of a file containing the server certificate or certificate chain.
-#
-# Mandatory: no
-# Default:
-# TLSCertFile=
-
-### Option: TLSKeyFile
-# Full pathname of a file containing the server private key.
-#
-# Mandatory: no
-# Default:
-# TLSKeyFile=
diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch
new file mode 100644
index 00000000000..7c3694a776e
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-3.0.30-mysql8.patch
@@ -0,0 +1,17 @@
+diff --git a/src/libs/zbxdb/db.c b/src/libs/zbxdb/db.c
+index a65b9c4..e011c51 100644
+--- a/src/libs/zbxdb/db.c
++++ b/src/libs/zbxdb/db.c
+@@ -285,7 +285,11 @@ int zbx_db_connect(char *host, char *user, char *password, char *dbname, char *d
+ #if defined(HAVE_IBM_DB2)
+ char *connect = NULL;
+ #elif defined(HAVE_MYSQL)
+- my_bool mysql_reconnect = 1;
++#if LIBMYSQL_VERSION_ID >= 80000 /* my_bool type is removed in MySQL 8.0 */
++ bool mysql_reconnect = 1;
++#else
++ my_bool mysql_reconnect = 1;
++#endif
+ #elif defined(HAVE_ORACLE)
+ char *connect = NULL;
+ sword err = OCI_SUCCESS;
diff --git a/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch
new file mode 100644
index 00000000000..e0fd74de51c
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-3.0.30-security-disable-PidFile.patch
@@ -0,0 +1,49 @@
+diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
+index b73bd45..c10daca 100644
+--- a/conf/zabbix_agentd.conf
++++ b/conf/zabbix_agentd.conf
+@@ -5,6 +5,7 @@
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
+index 082f14e..de0284d 100644
+--- a/conf/zabbix_proxy.conf
++++ b/conf/zabbix_proxy.conf
+@@ -109,6 +109,7 @@ LogFile=/tmp/zabbix_proxy.log
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
+index 9f754ca..3999196 100644
+--- a/conf/zabbix_server.conf
++++ b/conf/zabbix_server.conf
+@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c
+index baa8415..04c7e0c 100644
+--- a/src/libs/zbxnix/pid.c
++++ b/src/libs/zbxnix/pid.c
+@@ -26,6 +26,8 @@ static int fdpid = -1;
+
+ int create_pid_file(const char *pidfile)
+ {
++ return SUCCEED;
++
+ int fd;
+ zbx_stat_t buf;
+ struct flock fl;
diff --git a/net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch
similarity index 100%
rename from net-analyzer/zabbix/files/4.0/patches/zbx401-modulepathfix.patch
rename to net-analyzer/zabbix/files/zabbix-4.0.18-modulepathfix.patch
diff --git a/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
new file mode 100644
index 00000000000..f6a6187b3fc
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-4.0.18-security-disable-PidFile.patch
@@ -0,0 +1,49 @@
+diff --git a/conf/zabbix_agentd.conf b/conf/zabbix_agentd.conf
+index 73f1621..825715c 100644
+--- a/conf/zabbix_agentd.conf
++++ b/conf/zabbix_agentd.conf
+@@ -5,6 +5,7 @@
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/conf/zabbix_proxy.conf b/conf/zabbix_proxy.conf
+index 7498ffa..de6b579 100644
+--- a/conf/zabbix_proxy.conf
++++ b/conf/zabbix_proxy.conf
+@@ -133,6 +133,7 @@ LogFile=/tmp/zabbix_proxy.log
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/conf/zabbix_server.conf b/conf/zabbix_server.conf
+index 760e685..3a252ae 100644
+--- a/conf/zabbix_server.conf
++++ b/conf/zabbix_server.conf
+@@ -62,6 +62,7 @@ LogFile=/tmp/zabbix_server.log
+
+ ### Option: PidFile
+ # Name of PID file.
++# THIS PARAMETER IS IGNORED IN GENTOO FOR SECURITY REASONS (https://bugs.gentoo.org/629884)
+ #
+ # Mandatory: no
+ # Default:
+diff --git a/src/libs/zbxnix/pid.c b/src/libs/zbxnix/pid.c
+index 6b1a333..7a9578a 100644
+--- a/src/libs/zbxnix/pid.c
++++ b/src/libs/zbxnix/pid.c
+@@ -26,6 +26,8 @@ static int fdpid = -1;
+
+ int create_pid_file(const char *pidfile)
+ {
++ return SUCCEED;
++
+ int fd;
+ zbx_stat_t buf;
+ struct flock fl;
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.init b/net-analyzer/zabbix/files/zabbix-agentd.init
new file mode 100644
index 00000000000..e2433ff8f6e
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-agentd.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/zabbix_agentd"
+command_args="--foreground --config /etc/zabbix/zabbix_agentd.conf"
+command_background="true"
+command_user="zabbix:zabbix"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ need net
+ provide zabbix-agent
+ use zabbix-server
+}
+
+start_pre() {
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf
+}
diff --git a/net-analyzer/zabbix/files/zabbix-agentd.service b/net-analyzer/zabbix/files/zabbix-agentd.service
index 8485d06f5a3..dc13089e0cf 100644
--- a/net-analyzer/zabbix/files/zabbix-agentd.service
+++ b/net-analyzer/zabbix/files/zabbix-agentd.service
@@ -1,14 +1,12 @@
[Unit]
-Description=Zabbix agent daemon
-After=network.target
+Description=Zabbix agent
+Documentation=https://zabbix.com/manuals
+After=network.target network-online.target
[Service]
-Type=forking
User=zabbix
Group=zabbix
-ExecStart=/usr/sbin/zabbix_agentd -c /etc/zabbix/zabbix_agentd.conf
-PIDFile=/run/zabbix/zabbix_agentd.pid
+ExecStart=/usr/sbin/zabbix_agentd --foreground --config /etc/zabbix/zabbix_agentd.conf
[Install]
WantedBy=multi-user.target
-
diff --git a/net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.conf
similarity index 100%
rename from net-analyzer/zabbix/files/3.0/conf.d/zabbix-jmx-proxy
rename to net-analyzer/zabbix/files/zabbix-jmx-proxy.conf
diff --git a/net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy b/net-analyzer/zabbix/files/zabbix-jmx-proxy.init
old mode 100755
new mode 100644
similarity index 100%
rename from net-analyzer/zabbix/files/3.0/init.d/zabbix-jmx-proxy
rename to net-analyzer/zabbix/files/zabbix-jmx-proxy.init
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.init b/net-analyzer/zabbix/files/zabbix-proxy.init
new file mode 100644
index 00000000000..8347b481fff
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-proxy.init
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/zabbix_proxy"
+command_args="--foreground --config /etc/zabbix/zabbix_proxy.conf"
+command_background="true"
+command_user="zabbix:zabbix"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ need net
+ provide zabbix-proxy
+}
+
+start_pre() {
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf
+}
+
diff --git a/net-analyzer/zabbix/files/zabbix-proxy.service b/net-analyzer/zabbix/files/zabbix-proxy.service
index 85ecd79cc88..78b07be0506 100644
--- a/net-analyzer/zabbix/files/zabbix-proxy.service
+++ b/net-analyzer/zabbix/files/zabbix-proxy.service
@@ -1,14 +1,12 @@
[Unit]
Description=Zabbix proxy
-After=network.target
+Documentation=https://zabbix.com/manuals
+After=network.target network-online.target
[Service]
-Type=forking
User=zabbix
Group=zabbix
-ExecStart=/usr/sbin/zabbix_proxy -c /etc/zabbix/zabbix_proxy.conf
-PIDFile=/run/zabbix/zabbix_proxy.pid
+ExecStart=/usr/sbin/zabbix_proxy --foreground --config /etc/zabbix/zabbix_proxy.conf
[Install]
WantedBy=multi-user.target
-
diff --git a/net-analyzer/zabbix/files/zabbix-server.init b/net-analyzer/zabbix/files/zabbix-server.init
new file mode 100644
index 00000000000..b0bf752abaf
--- /dev/null
+++ b/net-analyzer/zabbix/files/zabbix-server.init
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/zabbix_server"
+command_args="--foreground --config /etc/zabbix/zabbix_server.conf"
+command_background="true"
+command_user="zabbix:zabbix"
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+ need net
+ use mysql postgresql
+}
+
+start_pre() {
+ checkpath -q -d -m 0750 -o root:zabbix /etc/zabbix
+ checkpath -q -f -m 0640 -o root:zabbix /etc/zabbix/*.conf
+}
diff --git a/net-analyzer/zabbix/files/zabbix-server.service b/net-analyzer/zabbix/files/zabbix-server.service
index 3ea973356ef..a7bdc0d1e06 100644
--- a/net-analyzer/zabbix/files/zabbix-server.service
+++ b/net-analyzer/zabbix/files/zabbix-server.service
@@ -1,14 +1,15 @@
[Unit]
Description=Zabbix server
-After=syslog.target network.target postgresql.service
+Documentation=https://zabbix.com/manuals
+After=syslog.target syslog.service network.target network-online.target postgresql.service
+After=postgresql-9.6.service postgresql-10.service
+After=postgresql-11.service postgresql-12.service
+
[Service]
-Type=forking
User=zabbix
Group=zabbix
-ExecStart=/usr/sbin/zabbix_server -c /etc/zabbix/zabbix_server.conf
-PIDFile=/run/zabbix/zabbix_server.pid
+ExecStart=/usr/sbin/zabbix_server --foreground --config /etc/zabbix/zabbix_server.conf
[Install]
WantedBy=multi-user.target
-
diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
deleted file mode 100644
index 26b70005d75..00000000000
--- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping )
- server? ( net-analyzer/fping
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3 dev-db/mysql-connector-c:=[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc)
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/2.2"/zabbix_server.conf
- doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd \
- "${FILESDIR}/2.2"/init.d/zabbix-proxy
- dosbin \
- src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.2"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.2"/zabbix_agent.conf \
- "${FILESDIR}/2.2"/zabbix_agentd.conf
- doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
- dosbin \
- src/zabbix_agent/zabbix_agent \
- src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix \
- /etc/zabbix/zabbix_agent.conf \
- /etc/zabbix/zabbix_agentd.conf
- fperms 0640 \
- /etc/zabbix/zabbix_agent.conf \
- /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agent.conf \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- exeinto /${ZABBIXJAVA_BASE}/
- doexe \
- src/zabbix_java/settings.sh \
- src/zabbix_java/startup.sh \
- src/zabbix_java/shutdown.sh
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n <nodeid>"
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild
deleted file mode 100644
index 09ba412f2f8..00000000000
--- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild
+++ /dev/null
@@ -1,330 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping )
- server? ( net-analyzer/fping
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- default
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- exeinto /${ZABBIXJAVA_BASE}/
- doexe \
- src/zabbix_java/settings.sh \
- src/zabbix_java/startup.sh \
- src/zabbix_java/shutdown.sh
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n <nodeid>"
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.0.30.ebuild
similarity index 71%
rename from net-analyzer/zabbix/zabbix-3.4.15.ebuild
rename to net-analyzer/zabbix/zabbix-3.0.30.ebuild
index 0169c3ac73b..7a392ccf338 100644
--- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.30.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
HOMEPAGE="https://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
-SRC_URI="https://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
@@ -22,60 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server )
server? ( ^^ ( mysql oracle postgres odbc ) )
static? ( !oracle !snmp )"
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
ldap? (
- net-nds/openldap
=dev-libs/cyrus-sasl-2*
net-libs/gnutls
+ net-nds/openldap
)
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( dev-db/postgresql:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
+ mysql? ( dev-db/mysql-connector-c )
+ odbc? ( dev-db/unixODBC )
openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
+ proxy? ( sys-libs/zlib )
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- ssl? ( dev-libs/openssl:=[-bindist] )"
+ ssl? ( dev-libs/openssl:=[-bindist] )
+ xmpp? ( dev-libs/iksemel )
+"
RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
+ server? (
app-admin/webapp-config
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
+ dev-libs/libevent
+ dev-libs/libpcre
+ net-analyzer/fping[suid]
)
frontend? (
- >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
mysql? ( dev-lang/php[mysqli] )
odbc? ( dev-lang/php[odbc] )
oracle? ( dev-lang/php[oci8-instant-client] )
postgres? ( dev-lang/php[postgres] )
sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
+ )
+"
DEPEND="${COMMON_DEPEND}
static? (
+ curl? ( net-misc/curl[static-libs] )
ldap? (
- net-nds/openldap[static-libs]
=dev-libs/cyrus-sasl-2*[static-libs]
net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
)
- mysql? ( >=virtual/mysql-5.0.3[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( dev-db/postgresql:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
)
- virtual/pkgconfig"
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-security-disable-PidFile.patch"
+ "${FILESDIR}/${P}-mysql8.patch"
+)
S=${WORKDIR}/${MY_P}
@@ -105,13 +123,8 @@ pkg_setup() {
enewgroup zabbix
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
- java-pkg_jar-from slf4j-api
+ java-pkg-opt-2_pkg_setup
}
src_prepare() {
@@ -120,25 +133,25 @@ src_prepare() {
src_configure() {
econf \
- $(use_enable server) \
- $(use_enable proxy) \
$(use_enable agent) \
$(use_enable ipv6) \
- $(use_enable static) \
$(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
$(use_with ldap) \
- $(use_with snmp net-snmp) \
+ $(use_with libxml2) \
$(use_with mysql) \
- $(use_with postgres postgresql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
$(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
$(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
$(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl)
+ $(use_with ssl openssl) \
+ $(use_with xmpp jabber)
}
src_compile() {
@@ -148,64 +161,74 @@ src_compile() {
}
src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
/var/log/zabbix
+ )
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
if use server; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
+ doins "${S}"/conf/zabbix_server.conf
fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
fi
if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+ doins "${S}"/conf/zabbix_proxy.conf
+ fperms 0640 /etc/zabbix/zabbix_proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
fi
if use agent; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+ doins "${S}"/conf/zabbix_agentd.conf
+ fperms 0640 /etc/zabbix/zabbix_agentd.conf
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
dosbin src/zabbix_agent/zabbix_agentd
dobin \
src/zabbix_sender/zabbix_sender \
src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
fi
+ fowners root:zabbix /etc/zabbix
fowners zabbix:zabbix \
- /etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
@@ -253,17 +276,16 @@ src_install() {
src/zabbix_java/lib/logback.xml \
src/zabbix_java/lib/android-json-4.3_r3.1.jar \
src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi
}
pkg_postinst() {
if use server || use proxy ; then
elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
elog
zabbix_homedir=$(egethome zabbix)
diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild
deleted file mode 100644
index 2e1f7d32099..00000000000
--- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild
+++ /dev/null
@@ -1,332 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~x86"
-IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( >=dev-db/postgresql-8.1:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- server? ( sys-libs/zlib )
- proxy? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libpcre
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
- eapply_user
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n <nodeid>"
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.0.18.ebuild
similarity index 70%
rename from net-analyzer/zabbix/zabbix-4.2.7.ebuild
rename to net-analyzer/zabbix/zabbix-4.0.18.ebuild
index 19016227289..28210112c73 100644
--- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.0.18.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
HOMEPAGE="https://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
@@ -22,63 +22,78 @@ REQUIRED_USE="|| ( agent frontend proxy server )
server? ( ^^ ( mysql oracle postgres odbc ) )
static? ( !oracle !snmp )"
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
ldap? (
- net-nds/openldap
=dev-libs/cyrus-sasl-2*
net-libs/gnutls
+ net-nds/openldap
)
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( >=dev-db/postgresql-8.1:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- xmpp? ( dev-libs/iksemel )
libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
+ mysql? ( dev-db/mysql-connector-c )
odbc? ( dev-db/unixODBC )
- server? ( sys-libs/zlib )
+ openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
proxy? ( sys-libs/zlib )
- ssl? ( dev-libs/openssl:=[-bindist] )"
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+ ssl? ( dev-libs/openssl:=[-bindist] )
+ xmpp? ( dev-libs/iksemel )
+"
RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
+ server? (
app-admin/webapp-config
+ dev-libs/libevent
dev-libs/libpcre
- dev-libs/libevent )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
+ net-analyzer/fping[suid]
)
frontend? (
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
mysql? ( dev-lang/php[mysqli] )
odbc? ( dev-lang/php[odbc] )
oracle? ( dev-lang/php[oci8-instant-client] )
postgres? ( dev-lang/php[postgres] )
sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
+ )
+"
DEPEND="${COMMON_DEPEND}
static? (
+ curl? ( net-misc/curl[static-libs] )
ldap? (
- net-nds/openldap[static-libs]
=dev-libs/cyrus-sasl-2*[static-libs]
net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
)
- mysql? ( >=virtual/mysql-5.0.3[static-libs] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
)
- virtual/pkgconfig"
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
S=${WORKDIR}/${MY_P}
@@ -108,41 +123,35 @@ pkg_setup() {
enewgroup zabbix
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
- java-pkg_jar-from slf4j-api
+ java-pkg-opt-2_pkg_setup
}
src_prepare() {
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
- eapply_user
+ default
}
src_configure() {
econf \
- $(use_enable server) \
- $(use_enable proxy) \
$(use_enable agent) \
$(use_enable ipv6) \
- $(use_enable static) \
$(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
$(use_with ldap) \
- $(use_with snmp net-snmp) \
+ $(use_with libxml2) \
$(use_with mysql) \
- $(use_with postgres postgresql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
$(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
$(use_with sqlite sqlite3) \
- $(use_with xmpp jabber) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
$(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl)
+ $(use_with ssl openssl) \
+ $(use_with xmpp jabber)
}
src_compile() {
@@ -152,67 +161,74 @@ src_compile() {
}
src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
/var/log/zabbix
+ )
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
if use server; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
+ doins "${S}"/conf/zabbix_server.conf
fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
fi
if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+ doins "${S}"/conf/zabbix_proxy.conf
fperms 0640 /etc/zabbix/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
fi
if use agent; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+ doins "${S}"/conf/zabbix_agentd.conf
fperms 0640 /etc/zabbix/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
dosbin src/zabbix_agent/zabbix_agentd
dobin \
src/zabbix_sender/zabbix_sender \
src/zabbix_get/zabbix_get
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
fi
+ fowners root:zabbix /etc/zabbix
fowners zabbix:zabbix \
- /etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
@@ -260,17 +276,16 @@ src_install() {
src/zabbix_java/lib/logback.xml \
src/zabbix_java/lib/android-json-4.3_r3.1.jar \
src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi
}
pkg_postinst() {
if use server || use proxy ; then
elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
elog
zabbix_homedir=$(egethome zabbix)
diff --git a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
deleted file mode 100644
index bf5db4ac645..00000000000
--- a/net-analyzer/zabbix/zabbix-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="https://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 x86"
-IUSE="+agent java curl frontend ipv6 ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
-REQUIRED_USE="|| ( agent frontend proxy server )
- proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
- server? ( ^^ ( mysql oracle postgres odbc ) )
- static? ( !oracle !snmp )"
-
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
- ldap? (
- net-nds/openldap
- =dev-libs/cyrus-sasl-2*
- net-libs/gnutls
- )
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( >=dev-db/postgresql-8.1:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
- libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
- odbc? ( dev-db/unixODBC )
- server? ( sys-libs/zlib )
- proxy? ( sys-libs/zlib )
- server? ( dev-libs/libevent )
- ssl? ( dev-libs/openssl:=[-bindist] )"
-
-RDEPEND="${COMMON_DEPEND}
- proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
- app-admin/webapp-config
- dev-libs/libpcre )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
- )
- frontend? (
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
- mysql? ( dev-lang/php[mysqli] )
- odbc? ( dev-lang/php[odbc] )
- oracle? ( dev-lang/php[oci8-instant-client] )
- postgres? ( dev-lang/php[postgres] )
- sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- static? (
- ldap? (
- net-nds/openldap[static-libs]
- =dev-libs/cyrus-sasl-2*[static-libs]
- net-libs/gnutls[static-libs]
- )
- mysql? ( >=virtual/mysql-5.0.3[static] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
- )
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-pkg_setup() {
- if use oracle; then
- if [ -z "${ORACLE_HOME}" ]; then
- eerror
- eerror "The environment variable ORACLE_HOME must be set"
- eerror "and point to the correct location."
- eerror "It looks like you don't have Oracle installed."
- eerror
- die "Environment variable ORACLE_HOME is not set"
- fi
- if has_version 'dev-db/oracle-instantclient-basic'; then
- ewarn
- ewarn "Please ensure you have a full install of the Oracle client."
- ewarn "dev-db/oracle-instantclient* is NOT sufficient."
- ewarn
- fi
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
- eapply_user
-}
-
-src_configure() {
- econf \
- $(use_enable server) \
- $(use_enable proxy) \
- $(use_enable agent) \
- $(use_enable ipv6) \
- $(use_enable static) \
- $(use_enable java) \
- $(use_with ldap) \
- $(use_with snmp net-snmp) \
- $(use_with mysql) \
- $(use_with postgres postgresql) \
- $(use_with oracle) \
- $(use_with sqlite sqlite3) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
- $(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
- $(use_with ssl openssl)
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
- fi
-}
-
-src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- if use server; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
- fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
- fi
-
- if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
- fperms 0640 /etc/zabbix/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
- fi
-
- if use agent; then
- insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
- dosbin src/zabbix_agent/zabbix_agentd
- dobin \
- src/zabbix_sender/zabbix_sender \
- src/zabbix_get/zabbix_get
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
- fi
-
- fowners zabbix:zabbix \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
- fperms 0750 \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
-
- dodoc README INSTALL NEWS ChangeLog \
- conf/zabbix_agentd.conf \
- conf/zabbix_proxy.conf \
- conf/zabbix_agentd/userparameter_examples.conf \
- conf/zabbix_agentd/userparameter_mysql.conf \
- conf/zabbix_server.conf
-
- if use frontend; then
- webapp_src_preinst
- cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
- webapp_configfile \
- "${MY_HTDOCSDIR}"/include/db.inc.php \
- "${MY_HTDOCSDIR}"/include/config.inc.php
- webapp_src_install
- fi
-
- if use java; then
- dodir \
- /${ZABBIXJAVA_BASE} \
- /${ZABBIXJAVA_BASE}/bin \
- /${ZABBIXJAVA_BASE}/lib
- keepdir /${ZABBIXJAVA_BASE}
- exeinto /${ZABBIXJAVA_BASE}/bin
- doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
- exeinto /${ZABBIXJAVA_BASE}/lib
- doexe \
- src/zabbix_java/lib/logback-classic-0.9.27.jar \
- src/zabbix_java/lib/logback-console.xml \
- src/zabbix_java/lib/logback-core-0.9.27.jar \
- src/zabbix_java/lib/logback.xml \
- src/zabbix_java/lib/android-json-4.3_r3.1.jar \
- src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
- fi
-}
-
-pkg_postinst() {
- if use server || use proxy ; then
- elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
- elog
-
- zabbix_homedir=$(egethome zabbix)
- if [ -n "${zabbix_homedir}" ] && \
- [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
- ewarn
- ewarn "The user 'zabbix' should have his homedir changed"
- ewarn "to /var/lib/zabbix/home if you want to use"
- ewarn "custom alert scripts."
- ewarn
- ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
- ewarn
- ewarn "To change the homedir use:"
- ewarn " usermod -d /var/lib/zabbix/home zabbix"
- ewarn
- fi
- fi
-
- if use server; then
- elog
- elog "For distributed monitoring you have to run:"
- elog
- elog "zabbix_server -n <nodeid>"
- elog
- elog "This will convert database data for use with Node ID"
- elog "and also adds a local node."
- elog
- fi
-
- elog "--"
- elog
- elog "You may need to add these lines to /etc/services:"
- elog
- elog "zabbix-agent 10050/tcp Zabbix Agent"
- elog "zabbix-agent 10050/udp Zabbix Agent"
- elog "zabbix-trapper 10051/tcp Zabbix Trapper"
- elog "zabbix-trapper 10051/udp Zabbix Trapper"
- elog
-
- if use server || use proxy ; then
- # check for fping
- fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
- case "${fping_perms}" in
- 4[157][157][157])
- ;;
- *)
- ewarn
- ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
- ewarn "you have to make /usr/sbin/fping setuid root and executable"
- ewarn "by everyone. Run the following command to fix it:"
- ewarn
- ewarn " chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
- ewarn
- ewarn "Please be aware that this might impose a security risk,"
- ewarn "depending on the code quality of fping."
- ewarn
- ;;
- esac
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-4.4.5.ebuild b/net-analyzer/zabbix/zabbix-4.4.6.ebuild
similarity index 70%
rename from net-analyzer/zabbix/zabbix-4.4.5.ebuild
rename to net-analyzer/zabbix/zabbix-4.4.6.ebuild
index 2ff7b0830d7..8d4030480f5 100644
--- a/net-analyzer/zabbix/zabbix-4.4.5.ebuild
+++ b/net-analyzer/zabbix/zabbix-4.4.6.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
@@ -11,7 +11,7 @@ DESCRIPTION="ZABBIX is software for monitoring of your applications, network and
HOMEPAGE="https://www.zabbix.com/"
MY_P=${P/_/}
MY_PV=${PV/_/}
-SRC_URI="https://downloads.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/zabbix/ZABBIX%20Latest%20Stable/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
WEBAPP_MANUAL_SLOT="yes"
@@ -22,62 +22,77 @@ REQUIRED_USE="|| ( agent frontend proxy server )
server? ( ^^ ( mysql oracle postgres odbc ) )
static? ( !oracle !snmp )"
-COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+COMMON_DEPEND="
+ curl? ( net-misc/curl )
+ java? ( >=virtual/jdk-1.8:* )
ldap? (
- net-nds/openldap
=dev-libs/cyrus-sasl-2*
net-libs/gnutls
+ net-nds/openldap
)
- mysql? ( >=virtual/mysql-5.0.3 )
- sqlite? ( >=dev-db/sqlite-3.3.5 )
- postgres? ( >=dev-db/postgresql-8.1:* )
- oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
libxml2? ( dev-libs/libxml2 )
- curl? ( net-misc/curl )
- openipmi? ( sys-libs/openipmi )
- ssh? ( net-libs/libssh2 )
- java? ( virtual/jdk:* )
+ mysql? ( dev-db/mysql-connector-c )
odbc? ( dev-db/unixODBC )
- server? ( sys-libs/zlib )
+ openipmi? ( sys-libs/openipmi )
+ oracle? ( dev-db/oracle-instantclient-basic )
+ postgres? ( dev-db/postgresql:* )
proxy? ( sys-libs/zlib )
- server? ( dev-libs/libevent )
- ssl? ( dev-libs/openssl:=[-bindist] )"
+ server? (
+ dev-libs/libevent
+ sys-libs/zlib
+ )
+ snmp? ( net-analyzer/net-snmp )
+ sqlite? ( dev-db/sqlite )
+ ssh? ( net-libs/libssh2 )
+ ssl? ( dev-libs/openssl:=[-bindist] )
+"
RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ mysql? ( virtual/mysql )
proxy? ( net-analyzer/fping[suid] )
- server? ( net-analyzer/fping[suid]
+ server? (
app-admin/webapp-config
- dev-libs/libpcre )
- java? (
- >=virtual/jre-1.4
- dev-java/slf4j-api
+ dev-libs/libevent
+ dev-libs/libpcre
+ net-analyzer/fping[suid]
)
frontend? (
- >=dev-lang/php-5.4.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
- || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+ app-admin/webapp-config
+ dev-lang/php:*[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+ media-libs/gd[png]
+ virtual/httpd-php:*
mysql? ( dev-lang/php[mysqli] )
odbc? ( dev-lang/php[odbc] )
oracle? ( dev-lang/php[oci8-instant-client] )
postgres? ( dev-lang/php[postgres] )
sqlite? ( dev-lang/php[sqlite] )
- media-libs/gd[png]
- app-admin/webapp-config )"
+ )
+"
DEPEND="${COMMON_DEPEND}
static? (
+ curl? ( net-misc/curl[static-libs] )
ldap? (
- net-nds/openldap[static-libs]
=dev-libs/cyrus-sasl-2*[static-libs]
net-libs/gnutls[static-libs]
+ net-nds/openldap[static-libs]
)
- mysql? ( >=virtual/mysql-5.0.3[static] )
- sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
- postgres? ( >=dev-db/postgresql-8.1:*[static-libs] )
- libxml2? ( dev-libs/libxml2[static-libs] )
- curl? ( net-misc/curl[static-libs] )
- ssh? ( net-libs/libssh2 )
- odbc? ( dev-db/unixODBC[static-libs] )
+ libxml2? ( dev-libs/libxml2[static-libs] )
+ mysql? ( dev-db/mysql-connector-c[static-libs] )
+ odbc? ( dev-db/unixODBC[static-libs] )
+ postgres? ( dev-db/postgresql:*[static-libs] )
+ sqlite? ( dev-db/sqlite[static-libs] )
+ ssh? ( net-libs/libssh2 )
)
- virtual/pkgconfig"
+"
+BDEPEND="
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+ "${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
+)
S=${WORKDIR}/${MY_P}
@@ -107,39 +122,33 @@ pkg_setup() {
enewgroup zabbix
enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
- java-pkg_jar-from slf4j-api
+ java-pkg-opt-2_pkg_setup
}
src_prepare() {
- eapply -p1 "${FILESDIR}/4.0/patches/zbx401-modulepathfix.patch"
- eapply_user
+ default
}
src_configure() {
econf \
- $(use_enable server) \
- $(use_enable proxy) \
$(use_enable agent) \
$(use_enable ipv6) \
- $(use_enable static) \
$(use_enable java) \
+ $(use_enable proxy) \
+ $(use_enable server) \
+ $(use_enable static) \
+ $(use_with curl libcurl) \
$(use_with ldap) \
- $(use_with snmp net-snmp) \
+ $(use_with libxml2) \
$(use_with mysql) \
- $(use_with postgres postgresql) \
+ $(use_with odbc unixodbc) \
+ $(use_with openipmi openipmi) \
$(use_with oracle) \
+ $(use_with postgres postgresql) \
+ $(use_with snmp net-snmp) \
$(use_with sqlite sqlite3) \
- $(use_with curl libcurl) \
- $(use_with openipmi openipmi) \
$(use_with ssh ssh2) \
- $(use_with libxml2) \
- $(use_with odbc unixodbc) \
$(use_with ssl openssl)
}
@@ -150,67 +159,74 @@ src_compile() {
}
src_install() {
- dodir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
+ local dirs=(
+ /etc/zabbix
+ /var/lib/zabbix
+ /var/lib/zabbix/home
+ /var/lib/zabbix/scripts
+ /var/lib/zabbix/alertscripts
+ /var/lib/zabbix/externalscripts
/var/log/zabbix
+ )
- keepdir \
- /etc/zabbix \
- /var/lib/zabbix \
- /var/lib/zabbix/home \
- /var/lib/zabbix/scripts \
- /var/lib/zabbix/alertscripts \
- /var/lib/zabbix/externalscripts \
- /var/log/zabbix
+ for dir in "${dirs[@]}"; do
+ dodir "${dir}"
+ keepdir "${dir}"
+ done
if use server; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_server.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners root:zabbix /etc/zabbix/zabbix_server.conf
+ doins "${S}"/conf/zabbix_server.conf
fperms 0640 /etc/zabbix/zabbix_server.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-server.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+ fowners root:zabbix /etc/zabbix/zabbix_server.conf
+
+ newinitd "${FILESDIR}"/zabbix-server.init zabbix-server
+
+ dosbin src/zabbix_server/zabbix_server
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-server.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
fi
if use proxy; then
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
- dosbin src/zabbix_proxy/zabbix_proxy
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_proxy.conf
- fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+ doins "${S}"/conf/zabbix_proxy.conf
fperms 0640 /etc/zabbix/zabbix_proxy.conf
- dodir /usr/share/zabbix
- /bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
- systemd_dounit "${FILESDIR}/zabbix-proxy.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+ fowners root:zabbix /etc/zabbix/zabbix_proxy.conf
+
+ newinitd "${FILESDIR}"/zabbix-proxy.init zabbix-proxy
+
+ dosbin src/zabbix_proxy/zabbix_proxy
+
+ insinto /usr/share/zabbix
+ doins -r "${S}"/database/
+
+ systemd_dounit "${FILESDIR}"/zabbix-proxy.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
fi
if use agent; then
insinto /etc/zabbix
- doins "${FILESDIR}/3.0"/zabbix_agentd.conf
- fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+ doins "${S}"/conf/zabbix_agentd.conf
fperms 0640 /etc/zabbix/zabbix_agentd.conf
- doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+ fowners root:zabbix /etc/zabbix/zabbix_agentd.conf
+
+ newinitd "${FILESDIR}"/zabbix-agentd.init zabbix-agentd
+
dosbin src/zabbix_agent/zabbix_agentd
dobin \
src/zabbix_sender/zabbix_sender \
src/zabbix_get/zabbix_get
- fperms 0640 /etc/zabbix/zabbix_agentd.conf
- systemd_dounit "${FILESDIR}/zabbix-agentd.service"
- systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+
+ systemd_dounit "${FILESDIR}"/zabbix-agentd.service
+ systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
fi
+ fowners root:zabbix /etc/zabbix
fowners zabbix:zabbix \
- /etc/zabbix \
/var/lib/zabbix \
/var/lib/zabbix/home \
/var/lib/zabbix/scripts \
@@ -258,17 +274,16 @@ src_install() {
src/zabbix_java/lib/logback.xml \
src/zabbix_java/lib/android-json-4.3_r3.1.jar \
src/zabbix_java/lib/slf4j-api-1.6.1.jar
- fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
- doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
- doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+ newinitd "${FILESDIR}"/zabbix-jmx-proxy.init zabbix-jmx-proxy
+ newconfd "${FILESDIR}"/zabbix-jmx-proxy.conf zabbix-jmx-proxy
fi
}
pkg_postinst() {
if use server || use proxy ; then
elog
- elog "You may need to configure your database for Zabbix,"
- elog "if you have not already done so. "
+ elog "You may need to configure your database for Zabbix"
+ elog "if you have not already done so."
elog
zabbix_homedir=$(egethome zabbix)
@@ -280,8 +295,7 @@ pkg_postinst() {
ewarn "custom alert scripts."
ewarn
ewarn "A real homedir might be needed for configfiles"
- ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
- ewarn "using sendxmpp for Jabber alerts)."
+ ewarn "for custom alert scripts."
ewarn
ewarn "To change the homedir use:"
ewarn " usermod -d /var/lib/zabbix/home zabbix"
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-02-28 15:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-28 15:02 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/files/2.2/, net-analyzer/zabbix/, net-analyzer/zabbix/files/, Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox