main/zabbix: don't ship configuration files

5 files changed, 12 insertions, 1416 deletions

diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index df27dc54b..80888731b 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=zabbix
 pkgver=2.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="http://www.zabbix.com"
 arch="all"
@@ -19,10 +19,6 @@ pkggroups="zabbix"
 subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql
 	$pkgname-webif $pkgname-sqlite $pkgname-utils $pkgname-setup"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	zabbix_server.conf
-	zabbix_trapper.conf
-	zabbix_proxy.conf
-	zabbix_agentd.conf
 	zabbix-getloadavg.patch
 	automake.patch
 	musl-fix-includes.patch
@@ -61,6 +57,13 @@ prepare() {
 	aclocal -I m4 && autoconf && autoheader \
 		&& automake --add-missing || return 1
 	# update_config_sub
+	# Fix config file locations
+	for file in server agentd proxy; do
+		sed -i "$_builddir"/conf/zabbix_${file}.conf \
+			-e 's|SNMPTrapperFile=/tmp|SNMPTrapperFile=/var/log/zabbix|' \
+			-e 's|PidFile=/tmp|PidFile=/var/run/zabbix|' \
+			-e 's|LogFile=/tmp|LogFile=/var/log/zabbix|' || return 1
+	done
 }
 
 build() {
@@ -108,9 +111,9 @@ package() {
 	done
 	install -d -m0750 -o zabbix -g zabbix \
                 "$pkgdir"/var/run/zabbix "$pkgdir"/var/log/zabbix
-        install -D -m0644 "$srcdir"/zabbix_server.conf \
+        install -D -m0644 "$_builddir"/conf/zabbix_server.conf \
 		"$pkgdir"/etc/zabbix/zabbix_server.conf
-	install -D -m0644 "$srcdir"/zabbix_trapper.conf \
+	install -D -m0644 "$_builddir"/conf/zabbix_trapper.conf \
 		"$pkgdir"/etc/zabbix/zabbix_trapper.conf
         for i in server proxy; do
                 install -D -m0755 "$srcdir"/zabbix-$i.initd \
@@ -137,7 +140,7 @@ _do_db() {
 		"$subpkgdir"/usr/sbin/ || return 1
 	mv "$_builddir-$1"/src/zabbix_proxy/zabbix_proxy \
 		"$subpkgdir"/usr/sbin/ || return 1
-        install -D -m0644 "$srcdir"/zabbix_proxy.conf \
+        install -D -m0644 "$_builddir"/conf/zabbix_proxy.conf \
 		"$pkgdir"/etc/zabbix/zabbix_proxy.conf || return 1
 	cd "$_builddir"
 	for i in upgrades/dbpatches/*/$1; do
@@ -178,7 +181,7 @@ agent() {
 	install="$subpkgname.pre-install"
         install -d -m0750 -o zabbix -g zabbix \
                 "$subpkgdir"/var/run/zabbix "$subpkgdir"/var/log/zabbix
-	install -D -m0644 "$srcdir"/zabbix_agentd.conf \
+	install -D -m0644 "$_builddir"/conf/zabbix_agentd.conf \
 		"$subpkgdir"/etc/zabbix/zabbix_agentd.conf
 	install -D -m0755 "$srcdir"/zabbix-agentd.initd \
 		"$subpkgdir"/etc/init.d/zabbix-agentd
@@ -191,10 +194,6 @@ agent() {
 }
 
 md5sums="a82eb0d55d3ca947e10a4a55238f4388  zabbix-2.4.5.tar.gz
-bc69447c44db5dd95f5c56718bc6c280  zabbix_server.conf
-9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
-e9cc2ad434bff7ae7b769a6d4f8194ba  zabbix_proxy.conf
-721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
 3a71e310bd2b38498a7c6830169f7480  zabbix-getloadavg.patch
 bf62c539870874e11de39c60cb974786  automake.patch
 40c81bdec85815f4ba637eb6528cc5e8  musl-fix-includes.patch
@@ -204,10 +203,6 @@ d9711779f969958c8aa348991170578b  zabbix-agentd.initd
 0ce2ab963a0bc5a0a6e17a708b7c7064  zabbix-proxy.initd
 c3b399a406f7dd1df0de7b3fae3ed081  002-fix-res_send-on-uclibc.patch"
 sha256sums="4e2cf1e4893a45d83379a05e2debabddf16beab324c93e84adc0bb57716fb957  zabbix-2.4.5.tar.gz
-377de68bccb1be5f1cbdcee1a4091a3e3b10dd810a14854b43d8802afe7a52c1  zabbix_server.conf
-3ae307895c9a7189e29c4ebf7479ce08d4c3bbe1a7f0a3554828170dac417bab  zabbix_trapper.conf
-018a63c40e814fa6ecf5ec1825e85a6d24e55a59435ea4332f57c4e8b0b9c009  zabbix_proxy.conf
-98343193215c9e1bc79ff332688c684f7023da38583bba800acc404b12c6cc51  zabbix_agentd.conf
 d2c0651c5fa67a1857707552e79ecece7ca95c149042460c40456634bf7611dc  zabbix-getloadavg.patch
 b347ca77660e69bea353c50e2fce0c7c4cc837f782c9f84f74ba92c1a62b4c1b  automake.patch
 38b4e1a5d5c16c7d9b31347acf710d84b693f6e1df365d1072548e897e034884  musl-fix-includes.patch
@@ -217,10 +212,6 @@ ddf75041fb0afc5b211dd79a934341cc9db4325447ad33a42cbf09bdfb5cad42  zabbix-server.
 ec3a8c564be20221ea7560fbec345191cd251d58bd15e9c41abec40c2cf5b4f2  zabbix-proxy.initd
 c796e9aa371f50155b396da53504375f35f77bd3941440525dcaf92da33dac99  002-fix-res_send-on-uclibc.patch"
 sha512sums="bdcba684b3d1cdb9eb5e1f9b370ef450201de8dbd9fe1619ef2b2437de6c34762dc041fa873976c4af0a2af229eec450aa58b1663feb75b6345d303484d35ead  zabbix-2.4.5.tar.gz
-cf3920ab1f9ba56f49ae404e3d9f2e5bc2da182f74c176aeed0ad29326507ece56c566f7a2aea89b87e500b52ab0063a46e1866fe02f6990ab34d6145bddb2b3  zabbix_server.conf
-cd08d907838de646f65316950e8c71deae25be1701e0cc22e5fd2f636c21ef2365a537d247277bafb694cae8c5dbd22eb725c1647797ad3e4ac4b3df2084ef07  zabbix_trapper.conf
-7d5c52557e30fc44bbed9337b55a71834c27850f56040e838773080e3203968ea20b648606cfaa1a4d051e6796b52a773dd0c96161cfb67bb0692519302e244a  zabbix_proxy.conf
-8a3298cb98787f89b4cc0faa6168a1ab59860c60bec159ecd341db25c0903e89061b40d2b37df9e2df99e08b71b57089bcb25f352e7edf09fbc1b0bd3f1034f6  zabbix_agentd.conf
 b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700b53d1b7609e6185642650d7edd013c554b2af37fddae771c  zabbix-getloadavg.patch
 9bff8966cb8b3f1767bfb1b3f3529bca5c9957f2c8179a40ded3b4e43615ba9fb408aef43092fd119b7df80b042555d05c9780fac3760176b95524aa48252fee  automake.patch
 9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91  musl-fix-includes.patch
diff --git a/main/zabbix/zabbix_agentd.conf b/main/zabbix/zabbix_agentd.conf
deleted file mode 100644
index 7fe21ec41..000000000
--- a/main/zabbix/zabbix_agentd.conf
+++ /dev/null
@@ -1,228 +0,0 @@
-# This is a config file for Zabbix Agent (Unix)
-# To get more information about Zabbix, visit http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-### Option: PidFile
-#	Name of PID file.
-#
-# Mandatory: no
-# Default:
-PidFile=/var/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=1
-
-### 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.
-#	No spaces allowed. First entry is used for receiving list of and sending active checks.
-#	Note that hostnames must resolve hostname->IP address and IP address->hostname.
-#	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=
-
-### Option: Hostname
-#	Unique, case sensitive hostname.
-#	Required for active checks and must match hostname as configured on the server.
-#
-# Default:
-# Hostname=system.uname
-
-### 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.
-#
-# Mandatory: no
-# Default:
-# ListenIP=0.0.0.0
-
-# ListenIP=127.0.0.1
-
-### Option: DisablePassive
-#	Disable passive checks. The agent will not listen on any TCP port.
-#	Only active checks will be processed.
-#	0 - do not disable
-#	1 - disable
-#
-# Mandatory: no
-# Default:
-# DisablePassive=0
-
-##### Active checks related
-
-### Option: DisableActive
-#	Disable active checks. The agent will work in passive mode listening for server.
-#
-# Mandatory: no
-# Default:
-# DisableActive=0
-
-# DisableActive=1
-
-### Option: ServerPort
-#	Server port for retrieving list of and  sending active checks.
-#
-# Mandatory: no
-# Default:
-# ServerPort=10051
-
-### 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: StartAgents
-#	Number of pre-forked instances of zabbix_agentd that process passive checks.
-#
-# Mandatory: no
-# Range: 1-16
-# Default:
-# StartAgents=3
-
-### 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.
-#
-# Mandatory: no
-# Default:
-# Include=
-
-# Include=/etc/zabbix/zabbix_agent.userparams.conf
-# Include=/etc/zabbix/zabbix_agentd/
-
-
-####### 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>
-#	Note that shell command must not return empty string or EOL only.
-#	Example: UserParameter=system.test,who|wc -l
-#UserParameter=system.test,who|wc -l
-### Set of parameters for monitoring MySQL server (v3.23.42 and later)
-### Change -u<username> and add -p<password> if required
-#UserParameter=mysql.ping,mysqladmin -uroot ping|grep alive|wc -l
-#UserParameter=mysql.uptime,mysqladmin -uroot status|cut -f2 -d":"|cut -f1 -d"T"
-#UserParameter=mysql.threads,mysqladmin -uroot status|cut -f3 -d":"|cut -f1 -d"Q"
-#UserParameter=mysql.questions,mysqladmin -uroot status|cut -f4 -d":"|cut -f1 -d"S"
-#UserParameter=mysql.slowqueries,mysqladmin -uroot status|cut -f5 -d":"|cut -f1 -d"O"
-#UserParameter=mysql.qps,mysqladmin -uroot status|cut -f9 -d":"
-#UserParameter=mysql.version,mysql -V
diff --git a/main/zabbix/zabbix_proxy.conf b/main/zabbix/zabbix_proxy.conf
deleted file mode 100644
index 17c7fbd8e..000000000
--- a/main/zabbix/zabbix_proxy.conf
+++ /dev/null
@@ -1,561 +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=1
-
-### 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)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-#	Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_proxy.pid
-
-PidFile=/var/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=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 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: 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 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.
-#
-# 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-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=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 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=
diff --git a/main/zabbix/zabbix_server.conf b/main/zabbix/zabbix_server.conf
deleted file mode 100644
index b48c0c9bf..000000000
--- a/main/zabbix/zabbix_server.conf
+++ /dev/null
@@ -1,562 +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: 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=1
-
-### 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)
-#
-# Mandatory: no
-# Range: 0-4
-# Default:
-# DebugLevel=3
-
-### Option: PidFile
-#	Name of PID file.
-#
-# Mandatory: no
-# Default:
-# PidFile=/tmp/zabbix_server.pid
-
-PidFile=/var/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=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 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: 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 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.
-#
-# 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-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=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: 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=${datadir}/zabbix/alertscripts
-
-### 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: 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.
-#
-# 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=
diff --git a/main/zabbix/zabbix_trapper.conf b/main/zabbix/zabbix_trapper.conf
deleted file mode 100644
index 7f235f66b..000000000
--- a/main/zabbix/zabbix_trapper.conf
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is config file for zabbix_trapper
-# To get more information about ZABBIX, 
-# go http://www.zabbix.com
-
-############ GENERAL PARAMETERS #################
-
-# Specifies debug level
-# 1 - critical information
-# 2 - warnings (default)
-# 3 - for debugging (produces lots of information)
-
-DebugLevel=2
-
-# Spend no more than Timeout seconds on processing
-# Must be between 1 and 30
-
-Timeout=3
-
-# Name of log file
-# If not set, syslog will be used
-
-LogFile=/var/log/zabbix/zabbix_trapper.log
-
-# Database host name
-# Default is localhost
-
-DBHost=localhost
-
-# Database name
-
-DBName=zabbix
-
-# Database user
-
-DBUser=zabbix
-
-# Database password
-# Comment this line if no password used
-
-DBPassword=zabbix
-
-# Connect to MySQL usig Unix socket?
-
-#DBSocket=/tmp/mysql.sock