* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/, net-analyzer/zabbix/files/2.4/patches/, ...
@ 2016-10-01 19:14 Patrick Lauer
0 siblings, 0 replies; only message in thread
From: Patrick Lauer @ 2016-10-01 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 2e11c1610606a97f0bfdab53e16fa2bebbe1af73
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 1 19:09:44 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Oct 1 19:14:43 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e11c161
net-analyzer/zabbix: Remove 2.4 as it is EOL
net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd | 29 --
net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy | 28 --
net-analyzer/zabbix/files/2.4/init.d/zabbix-server | 27 -
.../zabbix/files/2.4/patches/zbx7479.patch | 83 ----
.../zabbix/files/2.4/patches/zbx8151.patch | 53 --
net-analyzer/zabbix/files/2.4/zabbix_agent.conf | 81 ---
net-analyzer/zabbix/files/2.4/zabbix_agentd.conf | 278 -----------
net-analyzer/zabbix/files/2.4/zabbix_proxy.conf | 519 --------------------
net-analyzer/zabbix/files/2.4/zabbix_server.conf | 546 ---------------------
net-analyzer/zabbix/zabbix-2.4.5.ebuild | 362 --------------
net-analyzer/zabbix/zabbix-2.4.7.ebuild | 362 --------------
net-analyzer/zabbix/zabbix-2.4.8.ebuild | 342 -------------
12 files changed, 2710 deletions(-)
diff --git a/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd b/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd
deleted file mode 100644
index e1e17b0..00000000
--- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-agentd
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.4/init.d/zabbix-proxy b/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy
deleted file mode 100644
index e048c18..00000000
--- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-proxy
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.4/init.d/zabbix-server b/net-analyzer/zabbix/files/2.4/init.d/zabbix-server
deleted file mode 100644
index f75996d..00000000
--- a/net-analyzer/zabbix/files/2.4/init.d/zabbix-server
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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.4/patches/zbx7479.patch b/net-analyzer/zabbix/files/2.4/patches/zbx7479.patch
deleted file mode 100644
index 79bb92f..00000000
--- a/net-analyzer/zabbix/files/2.4/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.4/patches/zbx8151.patch b/net-analyzer/zabbix/files/2.4/patches/zbx8151.patch
deleted file mode 100644
index 076e10a..00000000
--- a/net-analyzer/zabbix/files/2.4/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.4/zabbix_agent.conf b/net-analyzer/zabbix/files/2.4/zabbix_agent.conf
deleted file mode 100644
index dcb4b72..00000000
--- a/net-analyzer/zabbix/files/2.4/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.4/zabbix_agentd.conf b/net-analyzer/zabbix/files/2.4/zabbix_agentd.conf
deleted file mode 100644
index 4d49d36..00000000
--- a/net-analyzer/zabbix/files/2.4/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.4/zabbix_proxy.conf b/net-analyzer/zabbix/files/2.4/zabbix_proxy.conf
deleted file mode 100644
index d4bae2e..00000000
--- a/net-analyzer/zabbix/files/2.4/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.4/zabbix_server.conf b/net-analyzer/zabbix/files/2.4/zabbix_server.conf
deleted file mode 100644
index caba019..00000000
--- a/net-analyzer/zabbix/files/2.4/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/zabbix-2.4.5.ebuild b/net-analyzer/zabbix/zabbix-2.4.5.ebuild
deleted file mode 100644
index eec6b6b..00000000
--- a/net-analyzer/zabbix/zabbix-2.4.5.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp autotools java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://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"
-
-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-2.9 )
- server? ( <=net-analyzer/fping-2.9
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.6
- 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] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- eautoreconf
-}
-
-pkg_setup() {
- if use server || use proxy ; then
- local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
- declare -i dbnum=0
- for dbtype in ${dbtypes}; do
- use ${dbtype} && let dbnum++
- done
- if [ ${dbnum} -gt 1 ]; then
- eerror
- eerror "You can't use more than one database type in Zabbix."
- eerror "Select exactly one database type out of these: ${dbtypes}"
- eerror
- die "Multiple database types selected."
- elif [ ${dbnum} -lt 1 ]; then
- eerror
- eerror "Select exactly one database type out of these: ${dbtypes}"
- eerror
- die "No database type selected."
- fi
- 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
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-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
-
- elog "Feel free to download or contribute gentoo specific zabbix templates"
- elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
-
- # repeat fowners/fperms functionality from src_install()
- # here to catch wrong permissions on existing files in
- # the live filesystem (yeah, that sucks).
- chown -R zabbix:zabbix \
- "${ROOT}"/etc/zabbix \
- "${ROOT}"/var/lib/zabbix \
- "${ROOT}"/var/lib/zabbix/home \
- "${ROOT}"/var/lib/zabbix/scripts \
- "${ROOT}"/var/log/zabbix
- chmod 0750 \
- "${ROOT}"/etc/zabbix \
- "${ROOT}"/var/lib/zabbix \
- "${ROOT}"/var/lib/zabbix/home \
- "${ROOT}"/var/lib/zabbix/scripts \
- "${ROOT}"/var/log/zabbix
-
- chmod 0640 \
- "${ROOT}"/etc/zabbix/zabbix_*
-
- 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
-}
-
-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) \
- || die "econf failed"
-}
-
-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.4"/zabbix_server.conf
- doinitd "${FILESDIR}/2.4"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix: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.4"/init.d/zabbix-proxy
- dosbin \
- src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.4"/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.4"/zabbix_agent.conf \
- "${FILESDIR}/2.4"/zabbix_agentd.conf
- doinitd "${FILESDIR}/2.4"/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
-
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.4.7.ebuild b/net-analyzer/zabbix/zabbix-2.4.7.ebuild
deleted file mode 100644
index eec6b6b..00000000
--- a/net-analyzer/zabbix/zabbix-2.4.7.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# needed to make webapp-config dep optional
-WEBAPP_OPTIONAL="yes"
-inherit flag-o-matic webapp autotools java-pkg-opt-2 user systemd toolchain-funcs
-
-DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
-HOMEPAGE="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://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"
-
-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-2.9 )
- server? ( <=net-analyzer/fping-2.9
- app-admin/webapp-config )
- java? (
- >=virtual/jre-1.6
- 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] )
- media-libs/gd[png]
- app-admin/webapp-config )"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-ZABBIXJAVA_BASE="opt/zabbix_java"
-
-java_prepare() {
- cd "${S}/src/zabbix_java/lib"
- rm -v *.jar || die
-
- java-pkg_jar-from slf4j-api
-}
-
-src_prepare() {
- eautoreconf
-}
-
-pkg_setup() {
- if use server || use proxy ; then
- local dbnum dbtypes="mysql oracle postgres sqlite" dbtype
- declare -i dbnum=0
- for dbtype in ${dbtypes}; do
- use ${dbtype} && let dbnum++
- done
- if [ ${dbnum} -gt 1 ]; then
- eerror
- eerror "You can't use more than one database type in Zabbix."
- eerror "Select exactly one database type out of these: ${dbtypes}"
- eerror
- die "Multiple database types selected."
- elif [ ${dbnum} -lt 1 ]; then
- eerror
- eerror "Select exactly one database type out of these: ${dbtypes}"
- eerror
- die "No database type selected."
- fi
- 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
- fi
-
- if use frontend; then
- webapp_pkg_setup
- fi
-
- enewgroup zabbix
- enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
-}
-
-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
-
- elog "Feel free to download or contribute gentoo specific zabbix templates"
- elog "via https://github.com/deploylinux/gentooZabbixTemplates (WIP)."
-
- # repeat fowners/fperms functionality from src_install()
- # here to catch wrong permissions on existing files in
- # the live filesystem (yeah, that sucks).
- chown -R zabbix:zabbix \
- "${ROOT}"/etc/zabbix \
- "${ROOT}"/var/lib/zabbix \
- "${ROOT}"/var/lib/zabbix/home \
- "${ROOT}"/var/lib/zabbix/scripts \
- "${ROOT}"/var/log/zabbix
- chmod 0750 \
- "${ROOT}"/etc/zabbix \
- "${ROOT}"/var/lib/zabbix \
- "${ROOT}"/var/lib/zabbix/home \
- "${ROOT}"/var/lib/zabbix/scripts \
- "${ROOT}"/var/log/zabbix
-
- chmod 0640 \
- "${ROOT}"/etc/zabbix/zabbix_*
-
- 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
-}
-
-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) \
- || die "econf failed"
-}
-
-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.4"/zabbix_server.conf
- doinitd "${FILESDIR}/2.4"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix: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.4"/init.d/zabbix-proxy
- dosbin \
- src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.4"/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.4"/zabbix_agent.conf \
- "${FILESDIR}/2.4"/zabbix_agentd.conf
- doinitd "${FILESDIR}/2.4"/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
-
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- fi
-}
diff --git a/net-analyzer/zabbix/zabbix-2.4.8.ebuild b/net-analyzer/zabbix/zabbix-2.4.8.ebuild
deleted file mode 100644
index 85599b2..00000000
--- a/net-analyzer/zabbix/zabbix-2.4.8.ebuild
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="http://www.zabbix.com/"
-MY_P=${P/_/}
-MY_PV=${PV/_/}
-SRC_URI="http://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[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[static-libs] )
- 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) \
- || die "econf failed"
-}
-
-src_compile() {
- if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
- emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
- 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.4"/zabbix_server.conf
- doinitd "${FILESDIR}/2.4"/init.d/zabbix-server
- dosbin src/zabbix_server/zabbix_server
- fowners zabbix: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.4"/init.d/zabbix-proxy
- dosbin \
- src/zabbix_proxy/zabbix_proxy
- insinto /etc/zabbix
- doins \
- "${FILESDIR}/2.4"/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.4"/zabbix_agent.conf \
- "${FILESDIR}/2.4"/zabbix_agentd.conf
- doinitd "${FILESDIR}/2.4"/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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-10-01 19:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-01 19:14 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/, net-analyzer/zabbix/files/2.4/patches/, Patrick Lauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox