diff --git a/.zabbix.metadata b/.zabbix.metadata index 8b449e1..5fd4adf 100644 --- a/.zabbix.metadata +++ b/.zabbix.metadata @@ -1 +1 @@ -c9763fd79d63619740ed98157085ff7e2cc5ee94 SOURCES/zabbix-5.0.27.tar.gz +0069a9b1c6e4b580416bd037bb114149b7a12b46 SOURCES/zabbix-6.0.12.tar.gz diff --git a/SOURCES/agent2.conf.patch b/SOURCES/agent2.conf.patch new file mode 100644 index 0000000..212a5e3 --- /dev/null +++ b/SOURCES/agent2.conf.patch @@ -0,0 +1,39 @@ +diff -urN zabbix-6.0.0alpha5.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.0alpha5/src/go/conf/zabbix_agent2.conf +--- zabbix-6.0.0alpha5.orig/src/go/conf/zabbix_agent2.conf 2021-10-11 13:30:51.773826173 +0300 ++++ zabbix-6.0.0alpha5/src/go/conf/zabbix_agent2.conf 2021-10-11 13:35:07.332846424 +0300 +@@ -10,6 +10,8 @@ + # Default: + # PidFile=/tmp/zabbix_agent2.pid + ++PidFile=/run/zabbix/zabbix_agent2.pid ++ + ### Option: LogType + # Specifies where log messages are written to: + # system - syslog +@@ -27,6 +29,8 @@ + # Default: + # LogFile=/tmp/zabbix_agent2.log + ++LogFile=/var/log/zabbix/zabbix_agent2.log ++ + ### Option: LogFileSize + # Maximum size of log file in MB. + # 0 - disable automatic log rotation. +@@ -36,6 +40,8 @@ + # Default: + # LogFileSize=1 + ++LogFileSize=0 ++ + ### Option: DebugLevel + # Specifies debug level: + # 0 - basic information about starting and stopping of Zabbix processes +@@ -259,6 +265,8 @@ + # Default: + # Include= + ++Include=/etc/zabbix/zabbix_agent2.d/*.conf ++ + # Include=/usr/local/etc/zabbix_agent2.userparams.conf + # Include=/usr/local/etc/zabbix_agent2.conf.d/ + # Include=/usr/local/etc/zabbix_agent2.conf.d/*.conf diff --git a/SOURCES/agent2.conf.var.run.patch b/SOURCES/agent2.conf.var.run.patch new file mode 100644 index 0000000..84c2996 --- /dev/null +++ b/SOURCES/agent2.conf.var.run.patch @@ -0,0 +1,12 @@ +diff -urN zabbix-6.2.0rc1.orig/src/go/conf/zabbix_agent2.conf zabbix-6.2.0rc1/src/go/conf/zabbix_agent2.conf +--- zabbix-6.2.0rc1.orig/src/go/conf/zabbix_agent2.conf 2022-06-17 15:12:53.347314289 +0300 ++++ zabbix-6.2.0rc1/src/go/conf/zabbix_agent2.conf 2022-06-17 15:13:18.402810532 +0300 +@@ -10,7 +10,7 @@ + # Default: + # PidFile=/tmp/zabbix_agent2.pid + +-PidFile=/run/zabbix/zabbix_agent2.pid ++PidFile=/var/run/zabbix/zabbix_agent2.pid + + ### Option: LogType + # Specifies where log messages are written to: diff --git a/SOURCES/conf.patch b/SOURCES/conf.patch index d8febf9..13cb79c 100644 --- a/SOURCES/conf.patch +++ b/SOURCES/conf.patch @@ -1,11 +1,11 @@ -diff -urN zabbix-5.0.12/conf/zabbix_agentd.conf zabbix-5.0.12-patched/conf/zabbix_agentd.conf ---- zabbix-5.0.12/conf/zabbix_agentd.conf 2021-05-24 11:21:12.000000000 +0300 -+++ zabbix-5.0.12-patched/conf/zabbix_agentd.conf 2021-06-09 13:38:19.561653415 +0300 +diff -urN zabbix-5.4.0/conf/zabbix_agentd.conf zabbix-5.4.0-patched/conf/zabbix_agentd.conf +--- zabbix-5.4.0/conf/zabbix_agentd.conf 2021-04-26 18:52:41.000000000 +0300 ++++ zabbix-5.4.0-patched/conf/zabbix_agentd.conf 2021-06-03 13:50:48.085656485 +0300 @@ -10,6 +10,8 @@ # Default: # PidFile=/tmp/zabbix_agentd.pid -+PidFile=/var/run/zabbix/zabbix_agentd.pid ++PidFile=/run/zabbix/zabbix_agentd.pid + ### Option: LogType # Specifies where log messages are written to: @@ -28,7 +28,15 @@ diff -urN zabbix-5.0.12/conf/zabbix_agentd.conf zabbix-5.0.12-patched/conf/zabbi ### Option: DebugLevel # Specifies debug level: # 0 - basic information about starting and stopping of Zabbix processes -@@ -302,6 +306,8 @@ +@@ -293,6 +297,7 @@ + # Mandatory: no + # Default: + # User=zabbix ++# NOTE: This option is overriden by settings in systemd service file! + + ### Option: Include + # You may include individual files or all files in a directory in the configuration file. +@@ -302,6 +307,8 @@ # Default: # Include= @@ -37,9 +45,9 @@ diff -urN zabbix-5.0.12/conf/zabbix_agentd.conf zabbix-5.0.12-patched/conf/zabbi # Include=/usr/local/etc/zabbix_agentd.userparams.conf # Include=/usr/local/etc/zabbix_agentd.conf.d/ # Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf -diff -urN zabbix-5.0.12/conf/zabbix_proxy.conf zabbix-5.0.12-patched/conf/zabbix_proxy.conf ---- zabbix-5.0.12/conf/zabbix_proxy.conf 2021-05-24 11:21:12.000000000 +0300 -+++ zabbix-5.0.12-patched/conf/zabbix_proxy.conf 2021-06-09 13:40:44.055884862 +0300 +diff -urN zabbix-5.4.0/conf/zabbix_proxy.conf zabbix-5.4.0-patched/conf/zabbix_proxy.conf +--- zabbix-5.4.0/conf/zabbix_proxy.conf 2021-04-26 18:52:41.000000000 +0300 ++++ zabbix-5.4.0-patched/conf/zabbix_proxy.conf 2021-06-03 13:36:33.849788003 +0300 @@ -88,7 +88,7 @@ # Default: # LogFile= @@ -62,7 +70,7 @@ diff -urN zabbix-5.0.12/conf/zabbix_proxy.conf zabbix-5.0.12-patched/conf/zabbix # Default: # PidFile=/tmp/zabbix_proxy.pid -+PidFile=/var/run/zabbix/zabbix_proxy.pid ++PidFile=/run/zabbix/zabbix_proxy.pid + ### Option: SocketDir # IPC socket directory. @@ -71,12 +79,12 @@ diff -urN zabbix-5.0.12/conf/zabbix_proxy.conf zabbix-5.0.12-patched/conf/zabbix # Default: # SocketDir=/tmp -+SocketDir=/var/run/zabbix ++SocketDir=/run/zabbix + ### Option: DBHost # Database host name. # If set to localhost, socket is used for MySQL. -@@ -397,6 +403,8 @@ +@@ -414,6 +420,8 @@ # Default: # SNMPTrapperFile=/tmp/zabbix_traps.tmp @@ -85,18 +93,18 @@ diff -urN zabbix-5.0.12/conf/zabbix_proxy.conf zabbix-5.0.12-patched/conf/zabbix ### Option: StartSNMPTrapper # If 1, SNMP trapper process is started. # -@@ -514,6 +522,8 @@ +@@ -529,7 +537,7 @@ + # + # Mandatory: no # Default: - # ExternalScripts=${datadir}/zabbix/externalscripts +-# ExternalScripts=${datadir}/zabbix/externalscripts ++# ExternalScripts=/usr/lib/zabbix/externalscripts -+ExternalScripts=/usr/lib/zabbix/externalscripts -+ ### Option: FpingLocation # Location of fping. - # Make sure that fping binary has root ownership and SUID flag set. -diff -urN zabbix-5.0.12/conf/zabbix_server.conf zabbix-5.0.12-patched/conf/zabbix_server.conf ---- zabbix-5.0.12/conf/zabbix_server.conf 2021-05-24 11:21:12.000000000 +0300 -+++ zabbix-5.0.12-patched/conf/zabbix_server.conf 2021-06-09 13:42:36.072497729 +0300 +diff -urN zabbix-5.4.0/conf/zabbix_server.conf zabbix-5.4.0-patched/conf/zabbix_server.conf +--- zabbix-5.4.0/conf/zabbix_server.conf 2021-04-26 18:52:41.000000000 +0300 ++++ zabbix-5.4.0-patched/conf/zabbix_server.conf 2021-06-03 13:37:11.324270989 +0300 @@ -35,7 +35,7 @@ # Default: # LogFile= @@ -119,7 +127,7 @@ diff -urN zabbix-5.0.12/conf/zabbix_server.conf zabbix-5.0.12-patched/conf/zabbi # Default: # PidFile=/tmp/zabbix_server.pid -+PidFile=/var/run/zabbix/zabbix_server.pid ++PidFile=/run/zabbix/zabbix_server.pid + ### Option: SocketDir # IPC socket directory. @@ -128,12 +136,12 @@ diff -urN zabbix-5.0.12/conf/zabbix_server.conf zabbix-5.0.12-patched/conf/zabbi # Default: # SocketDir=/tmp -+SocketDir=/var/run/zabbix ++SocketDir=/run/zabbix + ### Option: DBHost # Database host name. # If set to localhost, socket is used for MySQL. -@@ -356,6 +362,8 @@ +@@ -373,6 +379,8 @@ # Default: # SNMPTrapperFile=/tmp/zabbix_traps.tmp @@ -142,46 +150,37 @@ diff -urN zabbix-5.0.12/conf/zabbix_server.conf zabbix-5.0.12-patched/conf/zabbi ### Option: StartSNMPTrapper # If 1, SNMP trapper process is started. # -@@ -512,6 +520,8 @@ +@@ -538,7 +546,7 @@ + # + # Mandatory: no # Default: - # AlertScriptsPath=${datadir}/zabbix/alertscripts +-# AlertScriptsPath=${datadir}/zabbix/alertscripts ++# AlertScriptsPath=/usr/lib/zabbix/alertscripts -+AlertScriptsPath=/usr/lib/zabbix/alertscripts -+ ### Option: ExternalScripts # Full path to location of external scripts. - # Default depends on compilation options. -@@ -521,6 +531,8 @@ +@@ -547,7 +555,7 @@ + # + # Mandatory: no # Default: - # ExternalScripts=${datadir}/zabbix/externalscripts +-# ExternalScripts=${datadir}/zabbix/externalscripts ++# ExternalScripts=/usr/lib/zabbix/externalscripts -+ExternalScripts=/usr/lib/zabbix/externalscripts -+ ### Option: FpingLocation # Location of fping. - # Make sure that fping binary has root ownership and SUID flag set. -diff -urN zabbix-5.0.12/src/go/conf/zabbix_agent2.conf zabbix-5.0.12-patched/src/go/conf/zabbix_agent2.conf ---- zabbix-5.0.12/src/go/conf/zabbix_agent2.conf 2021-05-24 11:21:13.000000000 +0300 -+++ zabbix-5.0.12-patched/src/go/conf/zabbix_agent2.conf 2021-06-09 13:39:45.320831681 +0300 -@@ -10,6 +10,8 @@ +diff -urN zabbix-5.4.0/src/go/conf/zabbix_web_service.conf zabbix-5.4.0-patched/src/go/conf/zabbix_web_service.conf +--- zabbix-5.4.0/src/go/conf/zabbix_web_service.conf 2021-04-26 18:52:41.000000000 +0300 ++++ zabbix-5.4.0-patched/src/go/conf/zabbix_web_service.conf 2021-06-03 13:39:04.704416798 +0300 +@@ -20,6 +20,8 @@ # Default: - # PidFile=/tmp/zabbix_agent2.pid + # LogFile=/tmp/zabbix_web_service.log -+PidFile=/var/run/zabbix/zabbix_agent2.pid ++LogFile=/var/log/zabbix/zabbix_web_service.log + - ### Option: LogType - # Specifies where log messages are written to: - # system - syslog -@@ -27,7 +29,7 @@ - # Default: - # LogFile= - --LogFile=/tmp/zabbix_agent2.log -+LogFile=/var/log/zabbix/zabbix_agent2.log - ### Option: LogFileSize # Maximum size of log file in MB. -@@ -38,6 +40,8 @@ + # 0 - disable automatic log rotation. +@@ -29,6 +31,8 @@ # Default: # LogFileSize=1 @@ -190,12 +189,3 @@ diff -urN zabbix-5.0.12/src/go/conf/zabbix_agent2.conf zabbix-5.0.12-patched/src ### Option: DebugLevel # Specifies debug level: # 0 - basic information about starting and stopping of Zabbix processes -@@ -261,6 +265,8 @@ - # Default: - # Include= - -+Include=/etc/zabbix/zabbix_agent2.d/*.conf -+ - # Include=/usr/local/etc/zabbix_agentd.userparams.conf - # Include=/usr/local/etc/zabbix_agentd.conf.d/ - # Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf diff --git a/SOURCES/conf.var.run.patch b/SOURCES/conf.var.run.patch new file mode 100644 index 0000000..08065f6 --- /dev/null +++ b/SOURCES/conf.var.run.patch @@ -0,0 +1,54 @@ +diff -urN zabbix-6.2.0rc1.orig/conf/zabbix_agentd.conf zabbix-6.2.0rc1/conf/zabbix_agentd.conf +--- zabbix-6.2.0rc1.orig/conf/zabbix_agentd.conf 2022-06-17 15:08:20.256831191 +0300 ++++ zabbix-6.2.0rc1/conf/zabbix_agentd.conf 2022-06-17 15:08:43.660356151 +0300 +@@ -10,7 +10,7 @@ + # Default: + # PidFile=/tmp/zabbix_agentd.pid + +-PidFile=/run/zabbix/zabbix_agentd.pid ++PidFile=/var/run/zabbix/zabbix_agentd.pid + + ### Option: LogType + # Specifies where log messages are written to: +diff -urN zabbix-6.2.0rc1.orig/conf/zabbix_proxy.conf zabbix-6.2.0rc1/conf/zabbix_proxy.conf +--- zabbix-6.2.0rc1.orig/conf/zabbix_proxy.conf 2022-06-17 15:08:20.256831191 +0300 ++++ zabbix-6.2.0rc1/conf/zabbix_proxy.conf 2022-06-17 15:09:55.866893477 +0300 +@@ -133,7 +133,7 @@ + # Default: + # PidFile=/tmp/zabbix_proxy.pid + +-PidFile=/run/zabbix/zabbix_proxy.pid ++PidFile=/var/run/zabbix/zabbix_proxy.pid + + ### Option: SocketDir + # IPC socket directory. +@@ -143,7 +143,7 @@ + # Default: + # SocketDir=/tmp + +-SocketDir=/run/zabbix ++SocketDir=/var/run/zabbix + + ### Option: DBHost + # Database host name. +diff -urN zabbix-6.2.0rc1.orig/conf/zabbix_server.conf zabbix-6.2.0rc1/conf/zabbix_server.conf +--- zabbix-6.2.0rc1.orig/conf/zabbix_server.conf 2022-06-17 15:08:20.256831191 +0300 ++++ zabbix-6.2.0rc1/conf/zabbix_server.conf 2022-06-17 15:09:29.379429530 +0300 +@@ -69,7 +69,7 @@ + # Default: + # PidFile=/tmp/zabbix_server.pid + +-PidFile=/run/zabbix/zabbix_server.pid ++PidFile=/var/run/zabbix/zabbix_server.pid + + ### Option: SocketDir + # IPC socket directory. +@@ -79,7 +79,7 @@ + # Default: + # SocketDir=/tmp + +-SocketDir=/run/zabbix ++SocketDir=/var/run/zabbix + + ### Option: DBHost + # Database host name. diff --git a/SOURCES/frontend.patch b/SOURCES/frontend.patch index 8805a42..d5fd55c 100644 --- a/SOURCES/frontend.patch +++ b/SOURCES/frontend.patch @@ -1,19 +1,19 @@ -diff -urN 5.0.19.orig/ui/include/classes/core/CConfigFile.php 5.0.19/ui/include/classes/core/CConfigFile.php ---- 5.0.19.orig/ui/include/classes/core/CConfigFile.php 2021-12-23 12:38:22.755316601 +0200 -+++ 5.0.19/ui/include/classes/core/CConfigFile.php 2021-12-23 12:39:28.253777545 +0200 -@@ -24,7 +24,7 @@ - const CONFIG_NOT_FOUND = 1; +diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.0alpha5/ui/include/classes/core/CConfigFile.php +--- zabbix-6.0.0alpha5.orig/ui/include/classes/core/CConfigFile.php 2021-10-25 13:53:56.255241288 +0300 ++++ zabbix-6.0.0alpha5/ui/include/classes/core/CConfigFile.php 2021-10-25 13:55:17.469626565 +0300 +@@ -25,7 +25,7 @@ const CONFIG_ERROR = 2; + const CONFIG_VAULT_ERROR = 3; - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php'; + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php'; private static $supported_db_types = [ ZBX_DB_MYSQL => true, -diff -urN 5.0.19.orig/ui/include/classes/core/ZBase.php 5.0.19/ui/include/classes/core/ZBase.php ---- 5.0.19.orig/ui/include/classes/core/ZBase.php 2021-12-23 12:38:22.755316601 +0200 -+++ 5.0.19/ui/include/classes/core/ZBase.php 2021-12-23 12:39:28.253777545 +0200 -@@ -326,7 +326,7 @@ +diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/core/ZBase.php zabbix-6.0.0alpha5/ui/include/classes/core/ZBase.php +--- zabbix-6.0.0alpha5.orig/ui/include/classes/core/ZBase.php 2021-10-25 13:53:56.255241288 +0300 ++++ zabbix-6.0.0alpha5/ui/include/classes/core/ZBase.php 2021-10-25 13:56:49.379799191 +0300 +@@ -368,7 +368,7 @@ * @throws Exception */ protected function setMaintenanceMode() { @@ -22,7 +22,7 @@ diff -urN 5.0.19.orig/ui/include/classes/core/ZBase.php 5.0.19/ui/include/classe if (defined('ZBX_DENY_GUI_ACCESS')) { if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) { -@@ -339,7 +339,7 @@ +@@ -381,7 +381,7 @@ * Load zabbix config file. */ protected function loadConfigFile() { @@ -31,19 +31,10 @@ diff -urN 5.0.19.orig/ui/include/classes/core/ZBase.php 5.0.19/ui/include/classe $config = new CConfigFile($configFile); $this->config = $config->load(); } -diff -urN 5.0.19.orig/ui/include/classes/setup/CSetupWizard.php 5.0.19/ui/include/classes/setup/CSetupWizard.php ---- 5.0.19.orig/ui/include/classes/setup/CSetupWizard.php 2021-12-23 12:38:22.759316509 +0200 -+++ 5.0.19/ui/include/classes/setup/CSetupWizard.php 2021-12-23 12:39:28.253777545 +0200 -@@ -430,7 +430,7 @@ - private function stage5(): array { - $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true); - -- $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH; -+ $config_file_name = CConfigFile::CONFIG_FILE_PATH; - $config = new CConfigFile($config_file_name); - $config->config = [ - 'DB' => [ -@@ -725,7 +725,7 @@ +diff -urN zabbix-6.0.0alpha5.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.0alpha5/ui/include/classes/setup/CSetupWizard.php +--- zabbix-6.0.0alpha5.orig/ui/include/classes/setup/CSetupWizard.php 2021-10-25 13:53:56.255241288 +0300 ++++ zabbix-6.0.0alpha5/ui/include/classes/setup/CSetupWizard.php 2021-10-25 14:00:03.899931721 +0300 +@@ -259,7 +259,7 @@ // make zabbix.conf.php downloadable header('Content-Type: application/x-httpd-php'); header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"'); @@ -52,3 +43,12 @@ diff -urN 5.0.19.orig/ui/include/classes/setup/CSetupWizard.php 5.0.19/ui/includ $config->config = [ 'DB' => [ 'TYPE' => $this->getConfig('DB_TYPE'), +@@ -793,7 +793,7 @@ + + $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true); + +- $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH; ++ $config_file_name = CConfigFile::CONFIG_FILE_PATH; + $config = new CConfigFile($config_file_name); + $config->config = [ + 'DB' => [ diff --git a/SOURCES/java-gateway.patch b/SOURCES/java-gateway.patch new file mode 100644 index 0000000..d4ed997 --- /dev/null +++ b/SOURCES/java-gateway.patch @@ -0,0 +1,79 @@ +diff -urN 5.4.orig/src/zabbix_java/lib/logback.xml 5.4/src/zabbix_java/lib/logback.xml +--- 5.4.orig/src/zabbix_java/lib/logback.xml 2021-02-03 14:46:36.510530149 +0200 ++++ 5.4/src/zabbix_java/lib/logback.xml 2021-02-03 16:08:48.139648517 +0200 +@@ -2,10 +2,10 @@ + + + +- /tmp/zabbix_java.log ++ /var/log/zabbix/zabbix_java_gateway.log + + +- /tmp/zabbix_java.log.%i ++ /var/log/zabbix/zabbix_java_gateway.log.%i + 1 + 3 + +diff -urN 5.4.orig/src/zabbix_java/settings.sh 5.4/src/zabbix_java/settings.sh +--- 5.4.orig/src/zabbix_java/settings.sh 2021-02-03 14:46:36.510530149 +0200 ++++ 5.4/src/zabbix_java/settings.sh 2021-02-03 17:30:37.637881653 +0200 +@@ -24,7 +24,7 @@ + # Default: + # PID_FILE= + +-PID_FILE="/tmp/zabbix_java.pid" ++PID_FILE="/var/run/zabbix/zabbix_java_gateway.pid" + + ### Option: zabbix.startPollers + # Number of worker threads to start. +diff -urN 5.4.orig/src/zabbix_java/shutdown.sh 5.4/src/zabbix_java/shutdown.sh +--- 5.4.orig/src/zabbix_java/shutdown.sh 2021-02-03 14:46:36.510530149 +0200 ++++ 5.4/src/zabbix_java/shutdown.sh 2021-02-03 14:54:19.090352858 +0200 +@@ -1,7 +1,14 @@ + #!/bin/sh + +-cd `dirname $0` +-. ./settings.sh ++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then ++ . /etc/zabbix/zabbix_java_gateway.conf ++fi ++ ++if [ -z $GATEWAY_HOME ]; then ++ GATEWAY_HOME="/usr/share/zabbix-java-gateway" ++fi ++ ++cd $GATEWAY_HOME + + if [ -n "$PID_FILE" ]; then + if [ -f "$PID_FILE" ]; then +diff -urN 5.4.orig/src/zabbix_java/startup.sh 5.4/src/zabbix_java/startup.sh +--- 5.4.orig/src/zabbix_java/startup.sh 2021-02-03 14:46:36.510530149 +0200 ++++ 5.4/src/zabbix_java/startup.sh 2021-02-03 15:51:17.466224873 +0200 +@@ -1,7 +1,12 @@ + #!/bin/sh + +-cd `dirname $0` +-. ./settings.sh ++if [ -r /etc/zabbix/zabbix_java_gateway.conf ]; then ++ . /etc/zabbix/zabbix_java_gateway.conf ++fi ++ ++if [ -z $GATEWAY_HOME ]; then ++ GATEWAY_HOME="/usr/share/zabbix-java-gateway" ++fi + + if [ -n "$PID_FILE" -a -f "$PID_FILE" ]; then + PID=`cat "$PID_FILE"` +@@ -15,9 +20,9 @@ + JAVA=${JAVA:-java} + + JAVA_OPTIONS="$JAVA_OPTIONS -server" +-if [ -z "$PID_FILE" ]; then +- JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=logback-console.xml" +-fi ++JAVA_OPTIONS="$JAVA_OPTIONS -Dlogback.configurationFile=/etc/zabbix/zabbix_java_gateway_logback.xml" ++ ++cd $GATEWAY_HOME + + CLASSPATH="lib" + for jar in lib/*.jar bin/*.jar; do diff --git a/SOURCES/zabbix-java-gateway.service b/SOURCES/zabbix-java-gateway.service index 59a0b03..75437e8 100644 --- a/SOURCES/zabbix-java-gateway.service +++ b/SOURCES/zabbix-java-gateway.service @@ -6,8 +6,9 @@ After=network.target [Service] Type=forking KillMode=process -PIDFile=/run/zabbix/zabbix_java.pid -ExecStart=/usr/sbin/zabbix_java_gateway +PIDFile=/run/zabbix/zabbix_java_gateway.pid +ExecStart=/usr/sbin/zabbix_java_gateway_startup +ExecStop=/usr/sbin/zabbix_java_gateway_shutdown SuccessExitStatus=143 User=zabbix Group=zabbix diff --git a/SOURCES/zabbix-nginx.conf b/SOURCES/zabbix-nginx.conf index 7de6be7..dee1961 100644 --- a/SOURCES/zabbix-nginx.conf +++ b/SOURCES/zabbix-nginx.conf @@ -1,5 +1,5 @@ server { -# listen 80; +# listen 8080; # server_name example.com; root /usr/share/zabbix; @@ -23,15 +23,18 @@ server { deny all; } - location ~ /(api\/|conf[^\.]|include|locale|vendor) { + location ~ /(api\/|conf[^\.]|include|locale) { + deny all; + return 404; + } + + location /vendor { deny all; return 404; } location ~ [^/]\.php(/|$) { fastcgi_pass unix:/run/php-fpm/zabbix.sock; -# fastcgi_pass unix:/var/opt/rh/rh-php72/run/php-fpm/zabbix.sock; -# fastcgi_pass unix:/var/opt/rh/rh-php73/run/php-fpm/zabbix.sock; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_index index.php; diff --git a/SOURCES/zabbix-php-fpm.conf b/SOURCES/zabbix-php-fpm.conf index 5c25c98..84e2488 100644 --- a/SOURCES/zabbix-php-fpm.conf +++ b/SOURCES/zabbix-php-fpm.conf @@ -22,4 +22,3 @@ php_value[post_max_size] = 16M php_value[upload_max_filesize] = 2M php_value[max_input_time] = 300 php_value[max_input_vars] = 10000 -; php_value[date.timezone] = Europe/Riga diff --git a/SOURCES/zabbix-web-fcgi.conf b/SOURCES/zabbix-web-fcgi.conf index cd47efb..09fca03 100644 --- a/SOURCES/zabbix-web-fcgi.conf +++ b/SOURCES/zabbix-web-fcgi.conf @@ -17,8 +17,6 @@ ProxyTimeout 300 SetHandler "proxy:unix:/run/php-fpm/zabbix.sock|fcgi://localhost" -# SetHandler "proxy:unix:/var/opt/rh/rh-php72/run/php-fpm/zabbix.sock|fcgi://localhost" -# SetHandler "proxy:unix:/var/opt/rh/rh-php73/run/php-fpm/zabbix.sock|fcgi://localhost" diff --git a/SOURCES/zabbix-web-service.service b/SOURCES/zabbix-web-service.service new file mode 100644 index 0000000..2b13a7e --- /dev/null +++ b/SOURCES/zabbix-web-service.service @@ -0,0 +1,19 @@ +[Unit] +Description=Zabbix Web Service +After=syslog.target +After=network.target + +[Service] +Environment="CONFFILE=/etc/zabbix/zabbix_web_service.conf" +EnvironmentFile=-/etc/sysconfig/zabbix_web_service +Type=simple +Restart=on-failure +KillMode=control-group +ExecStart=/usr/sbin/zabbix_web_service -c $CONFFILE +ExecStop=/bin/kill -SIGTERM $MAINPID +RestartSec=10s +User=zabbix +Group=zabbix + +[Install] +WantedBy=multi-user.target diff --git a/SOURCES/zabbix_policy.te b/SOURCES/zabbix_policy.te new file mode 100644 index 0000000..3c34570 --- /dev/null +++ b/SOURCES/zabbix_policy.te @@ -0,0 +1,22 @@ +module zabbix_policy 1.2; + +require { + type zabbix_t; + type zabbix_port_t; + type zabbix_var_run_t; + type postgresql_port_t; + type httpd_t; + class tcp_socket name_connect; + class sock_file { create unlink }; + class unix_stream_socket connectto; +} + +#============= zabbix_t ============== +allow zabbix_t self:unix_stream_socket connectto; +allow zabbix_t zabbix_port_t:tcp_socket name_connect; +allow zabbix_t zabbix_var_run_t:sock_file create; +allow zabbix_t zabbix_var_run_t:sock_file unlink; +allow httpd_t zabbix_port_t:tcp_socket name_connect; + +#============= httpd_t ============== +allow httpd_t postgresql_port_t:tcp_socket name_connect; diff --git a/SPECS/zabbix.spec b/SPECS/zabbix.spec index 5edd4b5..765d964 100644 --- a/SPECS/zabbix.spec +++ b/SPECS/zabbix.spec @@ -1,11 +1,11 @@ Name: zabbix -Version: 5.0.27 -Release: %{?alphatag:0.}2%{?alphatag}%{?dist} +Version: 6.0.12 +Release: %{?alphatag:%{?alphatag}.}release1%{?dist} Summary: The Enterprise-class open source monitoring solution Group: Applications/Internet License: GPLv2+ URL: http://www.zabbix.com/ -Source0: %{name}-%{version}%{?alphatag}.tar.gz +Source0: https://cdn.zabbix.com/zabbix/sources/development/6.0/%{name}-%{version}%{?alphatag}.tar.gz Source1: zabbix-web22.conf Source2: zabbix-web24.conf Source3: zabbix-logrotate.in @@ -17,7 +17,6 @@ Source10: zabbix-agent.service Source11: zabbix-server.service Source12: zabbix-proxy.service Source13: zabbix-java-gateway.service -Source14: zabbix_java_gateway-sysd Source15: zabbix-tmpfiles.conf Source16: zabbix-php-fpm.conf Source17: zabbix-web-fcgi.conf @@ -26,79 +25,97 @@ Source19: zabbix-agent2.service Source20: zabbix-agent.sysconfig Source21: zabbix-agent2.init Source22: zabbix-agent2.sysconfig -Source23: zabbix-php-fpm.conf.rhel-7 +Source23: zabbix-web-service.service +Source24: zabbix_policy.te Patch0: frontend.patch Patch1: fping3-sourceip-option.patch -Patch2: conf.patch -Patch3: rhel6-go11.6.patch +Patch2: java-gateway.patch +Patch3: conf.patch +Patch4: agent2.conf.patch +Patch5: rhel6-go11.6.patch +Patch6: conf.var.run.patch +Patch7: agent2.conf.var.run.patch Buildroot: %{_tmppath}/zabbix-%{version}-%{release}-root-%(%{__id_u} -n) %{!?build_agent: %global build_agent 1} -%if 0%{?rhel} <= 8 -%if 0%{?rhel} >= 6 %ifarch x86_64 -%{!?build_agent2: %global build_agent2 0} +%if 0%{?rhel} >= 6 +%{!?build_agent2: %global build_agent2 1} %endif +%if 0%{?rhel} >= 8 +%{!?build_web_service: %global build_web_service 1} %endif %endif -%if 0%{?rhel} <= 8 %if 0%{?rhel} >= 7 %{!?build_proxy: %global build_proxy 1} %{!?build_java_gateway: %global build_java_gateway 1} +%endif + +%if 0%{?rhel} >= 8 %{!?build_server: %global build_server 1} %{!?build_frontend: %global build_frontend 1} +%endif %{!?build_with_mysql: %global build_with_mysql 1} %{!?build_with_pgsql: %global build_with_pgsql 1} %{!?build_with_sqlite: %global build_with_sqlite 1} -%endif -%endif -%if 0%{?build_with_mysql} == 0 && 0%{?build_with_pgsql} == 0 +%{!?zabbix_script_dir: %global zabbix_script_dir /usr/lib/zabbix} + +%if 0%{build_with_mysql} == 0 && 0%{build_with_pgsql} == 0 %global build_server 0 -%if 0%{?build_with_sqlite} == 0 +%if 0%{build_with_sqlite} == 0 %global build_proxy 0 %endif %endif -# FIXME: Building debuginfo is broken on RHEL 8 & 9. Disabled for now. -%if 0%{?rhel} >= 8 +%if 0%{?rhel} >= 7 +%{!?build_selinux_policy: %global build_selinux_policy 1} +%endif + +# FIXME: Building debuginfo is broken on RHEL 5 & 8. Disabled for now. +%if 0%{?rhel} <= 5 || 0%{?rhel} >= 8 %define debug_package %{nil} %endif +# Enable hardening +%if 0%{?rhel} >= 8 +%global _hardened_build 1 +%endif + BuildRequires: make -%if 0%{?rhel} >= 7 -BuildRequires: systemd %if 0%{?rhel} >= 8 BuildRequires: mariadb-connector-c-devel -BuildRequires: libssh-devel >= 0.9.0 BuildRequires: postgresql-devel >= 12.0 -%else -BuildRequires: mysql-devel >= 5.5 -BuildRequires: libssh2-devel >= 1.0.0 -BuildRequires: postgresql-devel -%endif BuildRequires: sqlite-devel -%endif BuildRequires: net-snmp-devel BuildRequires: openldap-devel +BuildRequires: gnutls-devel BuildRequires: unixODBC-devel BuildRequires: curl-devel >= 7.13.1 BuildRequires: OpenIPMI-devel >= 2 +BuildRequires: libssh-devel >= 0.9.0 BuildRequires: java-devel >= 1.6.0 BuildRequires: libxml2-devel -BuildRequires: pcre-devel BuildRequires: libevent-devel -%if 0%{?rhel} >= 9 -BuildRequires: gnutls-devel +%endif +%if 0%{?rhel} >= 7 +BuildRequires: pcre2-devel %else +BuildRequires: pcre-devel +%endif %if 0%{?rhel} >= 6 BuildRequires: openssl-devel >= 1.0.1 %endif +%if 0%{?rhel} >= 7 +BuildRequires: systemd +%endif +%if 0%{?build_selinux_policy} +BuildRequires: policycoreutils-devel %endif %description @@ -106,6 +123,7 @@ Zabbix is the ultimate enterprise-level software designed for real-time monitoring of millions of metrics collected from tens of thousands of servers, virtual machines and network devices. +%if 0%{?build_agent} %package agent Summary: Zabbix agent Group: Applications/Internet @@ -121,18 +139,20 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %endif -%if 0%{?rhel} <= 8 -Obsoletes: zabbix %endif %if 0%{?build_agent2} != 1 +%if 0%{?build_agent} %description agent Zabbix agent to be installed on monitored systems. +%endif %else +%if 0%{?build_agent} %description agent Old implementation of zabbix agent. To be installed on monitored systems. +%endif %package agent2 Summary: Zabbix agent 2 @@ -148,15 +168,28 @@ Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service Requires(postun): /sbin/service %endif -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -%endif +Requires: zabbix-agent2-plugin-mongodb +Requires: zabbix-agent2-plugin-postgresql %description agent2 New implementation of zabbix agent. To be installed on monitored systems. %endif +%if 0%{?build_web_service} +%package web-service +Summary: Zabbix web service +Group: Applications/Internet +Requires: logrotate +Requires(post): systemd +Requires(preun): systemd +Requires(preun): systemd + +%description web-service +Zabbix web servce for performing various tasks using headless web browser. +%endif + +%if 0%{?build_agent} %package get Summary: Zabbix get Group: Applications/Internet @@ -170,8 +203,9 @@ Group: Applications/Internet %description sender Zabbix sender command line utility. +%endif -%if 0%{?rhel} >= 7 +%if 0%{?build_server} || 0%{?build_proxy} %package js Summary: Zabbix js Group: Applications/Internet @@ -179,6 +213,16 @@ Group: Applications/Internet %description js Zabbix js command line utility. +%package sql-scripts +Summary: Zabbix database sql scripts +Group: Applications/Internet +BuildArch: noarch + +%description sql-scripts +SQL files needed to setup Zabbix server or proxy databases +%endif + +%if 0%{?build_proxy} %package proxy-mysql Summary: Zabbix proxy for MySQL or MariaDB database Group: Applications/Internet @@ -188,10 +232,6 @@ Requires(preun): systemd Requires(postun): systemd Provides: zabbix-proxy = %{version}-%{release} Provides: zabbix-proxy-implementation = %{version}-%{release} -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -Obsoletes: zabbix-proxy -%endif %description proxy-mysql Zabbix proxy with MySQL or MariaDB database support. @@ -205,10 +245,6 @@ Requires(preun): systemd Requires(postun): systemd Provides: zabbix-proxy = %{version}-%{release} Provides: zabbix-proxy-implementation = %{version}-%{release} -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -Obsoletes: zabbix-proxy -%endif %description proxy-pgsql Zabbix proxy with PostgreSQL database support. @@ -222,14 +258,12 @@ Requires(preun): systemd Requires(postun): systemd Provides: zabbix-proxy = %{version}-%{release} Provides: zabbix-proxy-implementation = %{version}-%{release} -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -Obsoletes: zabbix-proxy -%endif %description proxy-sqlite3 Zabbix proxy with SQLite3 database support. +%endif +%if 0%{?build_server} %package server-mysql Summary: Zabbix server for MySQL or MariaDB database Group: Applications/Internet @@ -239,10 +273,6 @@ Requires(preun): systemd Requires(postun): systemd Provides: zabbix-server = %{version}-%{release} Provides: zabbix-server-implementation = %{version}-%{release} -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -Obsoletes: zabbix-server -%endif %description server-mysql Zabbix server with MySQL or MariaDB database support. @@ -256,14 +286,11 @@ Requires(preun): systemd Requires(postun): systemd Provides: zabbix-server = %{version}-%{release} Provides: zabbix-server-implementation = %{version}-%{release} -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -Obsoletes: zabbix-server -%endif - %description server-pgsql Zabbix server with PostgresSQL database support. +%endif +%if 0%{?build_frontend} %package web Summary: Zabbix web frontend common package Group: Application/Internet @@ -272,25 +299,14 @@ Requires: dejavu-sans-fonts Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives -%if 0%{?rhel} >= 8 %description web Zabbix web frontend common package -%endif -%if 0%{?rhel} == 7 -%description web -Zabbix web frontend common package - -Due to lack of official php7.2+ packages on RHEL/CentOS 7, -direct dependencies on php and it's modules have been removed from zabbix-web package. - -Suggest enabling redhat software collections repositories -and installing zabbix-web-mysql-scl or zabbix-web-pgsql-scl package. -%endif - -%if 0%{?rhel} >= 8 %package web-deps Summary: PHP dependencies metapackage for frontend +Group: Application/Internet +BuildArch: noarch +Requires: zabbix-web = %{version}-%{release} Requires: php-gd >= 7.2 Requires: php-bcmath >= 7.2 Requires: php-mbstring >= 7.2 @@ -308,9 +324,9 @@ PHP dependencies metapackage for frontend Summary: Zabbix web frontend for MySQL Group: Applications/Internet BuildArch: noarch -Requires: php-mysqlnd Requires: zabbix-web = %{version}-%{release} Requires: zabbix-web-deps = %{version}-%{release} +Requires: php-mysqlnd Provides: zabbix-web-database = %{version}-%{release} %description web-mysql @@ -320,9 +336,9 @@ Zabbix web frontend for MySQL Summary: Zabbix web frontend for PostgreSQL Group: Applications/Internet BuildArch: noarch -Requires: php-pgsql Requires: zabbix-web = %{version}-%{release} Requires: zabbix-web-deps = %{version}-%{release} +Requires: php-pgsql Provides: zabbix-web-database = %{version}-%{release} %description web-pgsql @@ -347,176 +363,50 @@ Requires: nginx %description nginx-conf Zabbix frontend configuration for nginx and php-fpm -%endif -# rhel >= 8 %package web-japanese Summary: Japanese font settings for Zabbix frontend Group: Applications/Internet BuildArch: noarch -%if 0%{?rhel} >= 8 Requires: google-noto-sans-cjk-ttc-fonts Requires: glibc-langpack-ja -%else -Requires: vlgothic-p-fonts -%endif Requires: zabbix-web = %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives %description web-japanese Japanese font configuration for Zabbix web frontend - -%if 0%{?rhel} == 7 -%package web-deps-scl -Summary: Convenience package for installing php dependencies of zabbix-web package from redhat software collections -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php72 -Requires: rh-php72-php-gd -Requires: rh-php72-php-bcmath -Requires: rh-php72-php-mbstring -Requires: rh-php72-php-xml -Requires: rh-php72-php-ldap -Requires: rh-php72-php-fpm -Requires: zabbix-web-database-scl = %{version}-%{release} - -%description web-deps-scl -Convenience package for installing php dependencies of zabbix-web package from redhat software collections - -%package web-deps-scl-php73 -Summary: Convenience package for installing php dependencies of zabbix-web package from redhat software collections -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php73 -Requires: rh-php73-php-gd -Requires: rh-php73-php-bcmath -Requires: rh-php73-php-mbstring -Requires: rh-php73-php-xml -Requires: rh-php73-php-ldap -Requires: rh-php73-php-fpm -Requires: zabbix-web-database-scl-php73 = %{version}-%{release} -Provides: zabbix-web-deps-scl = %{version}-%{release} - -%description web-deps-scl-php73 -Convenience package for installing php dependencies of zabbix-web package from redhat software collections - -%package web-mysql-scl -Summary: Zabbix web frontend for MySQL (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php72-php-mysqlnd -Requires: zabbix-web = %{version}-%{release} -Requires: zabbix-web-deps-scl = %{version}-%{release} -Provides: zabbix-web-database-scl = %{version}-%{release} - -%description web-mysql-scl -Convenience package for installing zabbix-web-mysql, and php dependencies from redhat software collections - -%package web-mysql-scl-php73 -Summary: Zabbix web frontend for MySQL (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php73-php-mysqlnd -Requires: zabbix-web = %{version}-%{release} -Requires: zabbix-web-deps-scl-php73 = %{version}-%{release} -Provides: zabbix-web-database-scl-php73 = %{version}-%{release} - -%description web-mysql-scl-php73 -Convenience package for installing zabbix-web-mysql, and php dependencies from redhat software collections - -%package web-pgsql-scl -Summary: Zabbix web frontend for PostgreSQL (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php72-php-pgsql -Requires: zabbix-web = %{version}-%{release} -Requires: zabbix-web-deps-scl = %{version}-%{release} -Provides: zabbix-web-database-scl = %{version}-%{release} - -%description web-pgsql-scl -Convenience package for installing zabbix-web-pgsql, and php dependencies from redhat software collections - -%package web-pgsql-scl-php73 -Summary: Zabbix web frontend for PostgreSQL (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: rh-php73-php-pgsql -Requires: zabbix-web = %{version}-%{release} -Requires: zabbix-web-deps-scl-php73 = %{version}-%{release} -Provides: zabbix-web-database-scl-php73 = %{version}-%{release} - -%description web-pgsql-scl-php73 -Convenience package for installing zabbix-web-pgsql, and php dependencies from redhat software collections - -%package apache-conf-scl -Summary: Zabbix frontend configuration for apache (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: zabbix-web-deps-scl = %{version}-%{release} -Requires: httpd - -%description apache-conf-scl -Zabbix frontend configuration for apache (scl version) - -%package apache-conf-scl-php73 -Summary: Zabbix frontend configuration for apache (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: zabbix-web-deps-scl-php73 = %{version}-%{release} -Requires: httpd - -%description apache-conf-scl-php73 -Zabbix frontend configuration for apache (scl version) - -%package nginx-conf-scl -Summary: Zabbix frontend configuration for nginx (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: zabbix-web-deps-scl = %{version}-%{release} -Requires: rh-nginx116-nginx - -%description nginx-conf-scl -Zabbix frontend configuration for nginx (scl version) - -%package nginx-conf-scl-php73 -Summary: Zabbix frontend configuration for nginx (scl version) -Group: Applications/Internet -BuildArch: noarch -Requires: zabbix-web-deps-scl-php73 = %{version}-%{release} -Requires: rh-nginx116-nginx - -%description nginx-conf-scl-php73 -Zabbix frontend configuration for nginx (scl version) %endif -# rhel == 7 +%if 0%{?build_java_gateway} %package java-gateway Summary: Zabbix java gateway Group: Applications/Internet -%if 0%{?rhel} >= 7 Requires: java-headless >= 1.6.0 -%else -Requires: java >= 1.6.0 -%endif -%if 0%{?rhel} >= 7 Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%else -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/chkconfig -Requires(preun): /sbin/service -Requires(postun): /sbin/service -%endif -%if 0%{?rhel} <= 8 -Obsoletes: zabbix -%endif %description java-gateway Zabbix java gateway %endif -# rhel >= 7 + +%if 0%{?build_selinux_policy} +%package selinux-policy +Summary: Zabbix SELinux policy +Group: Applications/Internet +Requires(post): %{_sbindir}/semodule +Requires(preun): %{_sbindir}/semodule + +%description selinux-policy +Zabbix SELinux policy +%endif + + + +# +# prep +# %prep %setup0 -q -n %{name}-%{version}%{?alphatag} @@ -554,47 +444,52 @@ sed -i -e 's|/usr/bin/traceroute|/bin/traceroute|' database/sqlite3/data.sql %endif %if 0%{?build_server} -# copy sql files for servers -cat database/mysql/schema.sql > database/mysql/create.sql -cat database/mysql/images.sql >> database/mysql/create.sql -cat database/mysql/data.sql >> database/mysql/create.sql -gzip database/mysql/create.sql +# sql files for servers +cat database/mysql/schema.sql > database/mysql/server.sql +cat database/mysql/images.sql >> database/mysql/server.sql +cat database/mysql/data.sql >> database/mysql/server.sql +gzip database/mysql/server.sql -cat database/postgresql/schema.sql > database/postgresql/create.sql -cat database/postgresql/images.sql >> database/postgresql/create.sql -cat database/postgresql/data.sql >> database/postgresql/create.sql -gzip database/postgresql/create.sql -gzip database/postgresql/timescaledb.sql +cat database/postgresql/schema.sql > database/postgresql/server.sql +cat database/postgresql/images.sql >> database/postgresql/server.sql +cat database/postgresql/data.sql >> database/postgresql/server.sql +gzip database/postgresql/server.sql %endif %if 0%{?build_proxy} -# sql files for proxyes -gzip database/mysql/schema.sql -gzip database/postgresql/schema.sql -gzip database/sqlite3/schema.sql +# sql files for proxies +mv database/mysql/schema.sql database/mysql/proxy.sql +mv database/postgresql/schema.sql database/postgresql/proxy.sql +mv database/sqlite3/schema.sql database/sqlite3/proxy.sql %endif %if 0%{?build_java_gateway} -# change log directory for Java Gateway -sed -i -e 's|/tmp/zabbix_java.log|/var/log/zabbix/zabbix_java_gateway.log|g' src/zabbix_java/lib/logback.xml +%patch2 -p1 %endif # update config files -%patch2 -p1 +%patch3 -p1 %if 0%{?build_agent2} +%patch4 -p1 %if 0%{?rhel} == 6 -%patch3 -p1 +%patch5 -p1 %endif %endif +%if 0%{?rhel} <= 6 +%patch6 -p1 +%if 0%{?build_agent2} +%patch7 -p1 +%endif +%endif +%build # Build consists of 1-3 configure/make passes, one for each database. # pass 1: is sqlite proxy, may be omitted. # pass 2: is pqsql server/proxy, may be omitted. # pass 3: If only one database is enabled, then it must occur with pass 3. -%build build_conf_common=" --enable-dependency-tracking --sysconfdir=/etc/zabbix @@ -612,14 +507,14 @@ build_conf_common=" %endif --with-libxml2 --with-libevent - --with-libpcre -%if 0%{?rhel} >= 9 - --with-gnutls +%if 0%{?rhel} >= 7 + --with-libpcre2 %else + --with-libpcre +%endif %if 0%{?rhel} >= 6 --with-openssl %endif -%endif " # setup pass 3 @@ -670,7 +565,7 @@ fi %endif -# add agents and java-gateway to pass 3 +# add agents, web-service and java-gateway to pass 3 build_conf_3=" %if 0%{?build_agent} --enable-agent @@ -681,10 +576,21 @@ build_conf_3=" %if 0%{?build_java_gateway} --enable-java %endif +%if 0%{?build_web_service} + --enable-webservice +%endif $build_conf_3 " +%if 0%{?build_server} || 0%{?build_proxy} +make_flags="EXTERNAL_SCRIPTS_PATH=/usr/lib/zabbix/externalscripts" +%endif + +%if 0%{?build_server} +make_flags="$make_flags ALERT_SCRIPTS_PATH=/usr/lib/zabbix/alertscripts" +%endif + # pass 1 if [ -n "$build_conf_1" ]; then %configure $build_conf_common $build_conf_1 @@ -719,6 +625,13 @@ if [ -n "$build_conf_3" ]; then fi +# build selinux policy +%if 0%{?build_selinux_policy} +cp %{SOURCE24} . +make -f /usr/share/selinux/devel/Makefile zabbix_policy.pp +%endif + + # # install # @@ -728,12 +641,15 @@ fi rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/zabbix mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/zabbix -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zabbix +mkdir -p $RPM_BUILD_ROOT%{_datadir} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/man/man8 mkdir -p $RPM_BUILD_ROOT%{_datadir}/zabbix +mkdir -p $RPM_BUILD_ROOT%{_sbindir} -# install -%if 0%{?build_agent2} + +%if 0%{?build_agent2} || 0%{?build_web_service} make DESTDIR=$RPM_BUILD_ROOT GOBIN=$RPM_BUILD_ROOT%{_sbindir} install %else make DESTDIR=$RPM_BUILD_ROOT install @@ -748,27 +664,27 @@ cat %{SOURCE3} | sed \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent %if 0%{?rhel} >= 7 install -Dm 0644 -p %{SOURCE10} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent.service -install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix-agent.conf +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-agent.conf %else install -Dm 0755 -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent install -Dm 0644 -p %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-agent %endif %else -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_agentd.conf -rm -f $RPM_BUILD_ROOT%{_sbindir}/zabbix_agentd +%if 0%{?build_agent2} +rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_agentd +rm $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_agentd.conf +%endif %endif %if 0%{?build_agent2} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8 -mkdir $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_agent2.d -cp man/zabbix_agent2.man $RPM_BUILD_ROOT%{_mandir}/man8/zabbix_agent2.8 cat %{SOURCE3} | sed \ -e 's|COMPONENT|agent2|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-agent2 +cp man/zabbix_agent2.man $RPM_BUILD_ROOT%{_mandir}/man8/zabbix_agent2.8 %if 0%{?rhel} >= 7 install -Dm 0644 -p %{SOURCE19} $RPM_BUILD_ROOT%{_unitdir}/zabbix-agent2.service -install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix_agent2.conf +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix_agent2.conf %else install -Dm 0755 -p %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/zabbix-agent2 install -Dm 0644 -p %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-agent2 @@ -776,94 +692,113 @@ install -Dm 0644 -p %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/zabbix-a %endif +%if 0%{?build_web_service} +cat %{SOURCE3} | sed \ + -e 's|COMPONENT|web-service|g' \ + > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-web-service +cp man/zabbix_web_service.man $RPM_BUILD_ROOT%{_mandir}/man8/zabbix_web_service.8 +install -Dm 0644 -p %{SOURCE23} $RPM_BUILD_ROOT%{_unitdir}/zabbix-web-service.service +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix_web_service.conf +%endif + + %if 0%{?build_server} || 0%{?build_proxy} -mkdir -p $RPM_BUILD_ROOT/usr/lib/zabbix -mv $RPM_BUILD_ROOT%{_datadir}/zabbix/externalscripts $RPM_BUILD_ROOT/usr/lib/zabbix +mkdir -p $RPM_BUILD_ROOT%{zabbix_script_dir} +mv $RPM_BUILD_ROOT%{_datadir}/zabbix/externalscripts $RPM_BUILD_ROOT%{zabbix_script_dir} + + +# +# install sql files +# +%if 0%{?build_with_mysql} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +%if 0%{?build_proxy} +cp database/mysql/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +%endif +%if 0%{?build_server} +cp database/mysql/server.sql.gz $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +cp database/mysql/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +cp database/mysql/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/mysql +%endif +%endif + +%if 0%{?build_with_pgsql} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +%if 0%{?build_proxy} +cp database/postgresql/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +%endif +%if 0%{?build_server} +cp database/postgresql/server.sql.gz $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp database/postgresql/timescaledb.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp database/postgresql/double.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp database/postgresql/history_pk_prepare.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +%endif +cp -R database/postgresql/tsdb_history_pk_upgrade_no_compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +cp -R database/postgresql/tsdb_history_pk_upgrade_with_compression $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/postgresql +%endif + +%if 0%{?build_with_sqlite} && 0%{?build_proxy} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/sqlite3 +cp database/sqlite3/proxy.sql $RPM_BUILD_ROOT%{_datadir}/zabbix-sql-scripts/sqlite3 +%endif %endif %if 0%{?build_proxy} +mv $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_proxy.conf.d $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_proxy.d install -m 0755 -p src/zabbix_proxy/zabbix_proxy_* $RPM_BUILD_ROOT%{_sbindir}/ rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_proxy -mv $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_proxy.conf.d $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_proxy.d cat %{SOURCE3} | sed \ -e 's|COMPONENT|proxy|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-proxy install -Dm 0644 -p %{SOURCE12} $RPM_BUILD_ROOT%{_unitdir}/zabbix-proxy.service -install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix-proxy.conf +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-proxy.conf %endif %if 0%{?build_server} +mv $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_server.conf.d $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_server.d install -m 0755 -p src/zabbix_server/zabbix_server_* $RPM_BUILD_ROOT%{_sbindir}/ rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_server -mv $RPM_BUILD_ROOT%{_datadir}/zabbix/alertscripts $RPM_BUILD_ROOT/usr/lib/zabbix -mv $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_server.conf.d $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_server.d +mv $RPM_BUILD_ROOT%{_datadir}/zabbix/alertscripts $RPM_BUILD_ROOT%{zabbix_script_dir} cat %{SOURCE3} | sed \ -e 's|COMPONENT|server|g' \ > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/zabbix-server install -Dm 0644 -p %{SOURCE11} $RPM_BUILD_ROOT%{_unitdir}/zabbix-server.service -install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix-server.conf +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-server.conf %endif %if 0%{?build_frontend} -# install frontend files find ui -name '*.orig' | xargs rm -f cp -a ui/* $RPM_BUILD_ROOT%{_datadir}/zabbix - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/web touch $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/web/zabbix.conf.php mv $RPM_BUILD_ROOT%{_datadir}/zabbix/conf/maintenance.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/web/ - -%if 0%{?rhel} >= 7 -install -Dm 0644 -p %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zabbix.conf -%endif - -%if 0%{?rhel} >= 8 install -Dm 0644 -p %{SOURCE16} $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.d/zabbix.conf - -sed -i '/rh-php7/d' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zabbix.conf +install -Dm 0644 -p %{SOURCE17} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zabbix.conf install -Dm 0644 -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/zabbix.conf -sed -i '/rh-php7/d' $RPM_BUILD_ROOT%{_sysconfdir}/nginx/conf.d/zabbix.conf -%endif - -%if 0%{?rhel} == 7 -install -Dm 0644 -p %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php72/php-fpm.d/zabbix.conf -sed -i 's:/run/php-fpm/zabbix.sock:/var/opt/rh/rh-php72/run/php-fpm/zabbix.sock:' \ - $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php72/php-fpm.d/zabbix.conf -sed -i 's:/var/lib/php/session:/var/opt/rh/rh-php72/lib/php/session/:' \ - $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php72/php-fpm.d/zabbix.conf - -install -Dm 0644 -p %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php73/php-fpm.d/zabbix.conf -sed -i 's:/run/php-fpm/zabbix.sock:/var/opt/rh/rh-php73/run/php-fpm/zabbix.sock:' \ - $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php73/php-fpm.d/zabbix.conf -sed -i 's:/var/lib/php/session:/var/opt/rh/rh-php73/lib/php/session/:' \ - $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-php73/php-fpm.d/zabbix.conf - -sed -i '\!:/run/php-fpm/zabbix.sock!d;/rh-php72/s/#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zabbix.conf - -install -Dm 0644 -p %{SOURCE18} $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-nginx116/nginx/conf.d/zabbix.conf -sed -i '\!:/run/php-fpm/zabbix.sock!d;/rh-php72/s/#//' $RPM_BUILD_ROOT%{_sysconfdir}/opt/rh/rh-nginx116/nginx/conf.d/zabbix.conf -%endif %endif %if 0%{?build_java_gateway} -rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/settings.sh -rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/startup.sh -rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/shutdown.sh +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/startup.sh $RPM_BUILD_ROOT%{_sbindir}/zabbix_java_gateway_startup +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/shutdown.sh $RPM_BUILD_ROOT%{_sbindir}/zabbix_java_gateway_shutdown +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/settings.sh $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway.conf mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/lib/logback.xml $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway_logback.xml rm $RPM_BUILD_ROOT%{_sbindir}/zabbix_java/lib/logback-console.xml -mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java $RPM_BUILD_ROOT/%{_datadir}/zabbix-java-gateway -install -m 0755 -p %{SOURCE14} $RPM_BUILD_ROOT%{_sbindir}/zabbix_java_gateway -cat src/zabbix_java/settings.sh | sed \ - -e 's|^PID_FILE=.*|PID_FILE="/var/run/zabbix/zabbix_java.pid"|g' \ - > $RPM_BUILD_ROOT%{_sysconfdir}/zabbix/zabbix_java_gateway.conf +mv $RPM_BUILD_ROOT%{_sbindir}/zabbix_java $RPM_BUILD_ROOT%{_datadir}/zabbix-java-gateway install -Dm 0644 -p %{SOURCE13} $RPM_BUILD_ROOT%{_unitdir}/zabbix-java-gateway.service -install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/zabbix-java-gateway.conf +install -Dm 0644 -p %{SOURCE15} $RPM_BUILD_ROOT%{_tmpfilesdir}/zabbix-java-gateway.conf +%endif + + +%if 0%{?build_selinux_policy} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/zabbix +mv zabbix_policy.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/zabbix %endif + %clean rm -rf $RPM_BUILD_ROOT @@ -872,7 +807,9 @@ rm -rf $RPM_BUILD_ROOT # files & scriptlets # + %if 0%{?build_agent} + %files agent %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README conf/zabbix_agentd/userparameter_mysql.conf @@ -885,7 +822,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/zabbix_agentd.8* %if 0%{?rhel} >= 7 %{_unitdir}/zabbix-agent.service -%{_prefix}/lib/tmpfiles.d/zabbix-agent.conf +%{_tmpfilesdir}/zabbix-agent.conf %else %{_sysconfdir}/init.d/zabbix-agent %config(noreplace) %{_sysconfdir}/sysconfig/zabbix-agent @@ -917,7 +854,6 @@ getent passwd zabbix > /dev/null || \ /sbin/chkconfig --add zabbix-agent || : %endif - %preun agent if [ "$1" = 0 ]; then %if 0%{?rhel} >= 7 @@ -947,20 +883,30 @@ fi %endif + %if 0%{?build_agent2} %files agent2 %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent2 %dir %{_sysconfdir}/zabbix/zabbix_agent2.d +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/ceph.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/docker.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/memcached.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/mysql.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/oracle.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/redis.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/smart.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/modbus.conf +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent2.d/plugins.d/mqtt.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-agent2 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_sbindir}/zabbix_agent2 %{_mandir}/man8/zabbix_agent2.8* %if 0%{?rhel} >= 7 %{_unitdir}/zabbix-agent2.service -%{_prefix}/lib/tmpfiles.d/zabbix_agent2.conf +%{_tmpfilesdir}/zabbix_agent2.conf %else %{_sysconfdir}/init.d/zabbix-agent2 %config(noreplace) %{_sysconfdir}/sysconfig/zabbix-agent2 @@ -991,16 +937,78 @@ fi %postun agent2 %systemd_postun_with_restart zabbix-agent2.service -: %endif %endif +%if 0%{?build_web_service} +%files web-service +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_sbindir}/zabbix_web_service +%config(noreplace) %{_sysconfdir}/zabbix/zabbix_web_service.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-web-service +%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix +%attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix +%{_unitdir}/zabbix-web-service.service +%{_tmpfilesdir}/zabbix_web_service.conf +%{_mandir}/man8/zabbix_web_service.8* + +%pre web-service +getent group zabbix > /dev/null || groupadd -r zabbix +getent passwd zabbix > /dev/null || \ + useradd -r -g zabbix -d %{_localstatedir}/lib/zabbix -s /sbin/nologin \ + -c "Zabbix Monitoring System" zabbix +: + +%post web-service +%systemd_post zabbix-web-service.service +: + +%preun web-service +%systemd_preun zabbix-web-service.service +: + +%postun web-service +%systemd_postun_with_restart zabbix-web-service.service +%endif + + %if 0%{?build_server} || 0%{?build_proxy} %files js %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/zabbix_js + +%files sql-scripts +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%if 0%{?build_server} +%{_datadir}/zabbix-sql-scripts/mysql/server.sql.gz +%{_datadir}/zabbix-sql-scripts/mysql/double.sql +%{_datadir}/zabbix-sql-scripts/mysql/history_pk_prepare.sql +%{_datadir}/zabbix-sql-scripts/postgresql/server.sql.gz +%{_datadir}/zabbix-sql-scripts/postgresql/timescaledb.sql +%{_datadir}/zabbix-sql-scripts/postgresql/double.sql +%{_datadir}/zabbix-sql-scripts/postgresql/history_pk_prepare.sql +%endif +%if 0%{?build_proxy} +%{_datadir}/zabbix-sql-scripts/mysql/proxy.sql +%{_datadir}/zabbix-sql-scripts/postgresql/proxy.sql +%{_datadir}/zabbix-sql-scripts/sqlite3/proxy.sql +%endif +%if 0%{?build_server} || 0%{?build_proxy} +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_log.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_str.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_text.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_no_compression/history_pk_uint.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_log.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_str.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_text.sql +%{_datadir}/zabbix-sql-scripts/postgresql/tsdb_history_pk_upgrade_with_compression/history_pk_uint.sql +%endif %endif @@ -1009,15 +1017,14 @@ fi %files proxy-mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%doc database/mysql/schema.sql.gz -%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf -%dir /usr/lib/zabbix/externalscripts +%attr(0600,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf +%dir %{zabbix_script_dir}/externalscripts %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_mandir}/man8/zabbix_proxy.8* %{_unitdir}/zabbix-proxy.service -%{_prefix}/lib/tmpfiles.d/zabbix-proxy.conf +%{_tmpfilesdir}/zabbix-proxy.conf %{_sbindir}/zabbix_proxy_mysql %pre proxy-mysql @@ -1051,15 +1058,14 @@ fi %files proxy-pgsql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%doc database/postgresql/schema.sql.gz %attr(0600,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf -%dir /usr/lib/zabbix/externalscripts +%dir %{zabbix_script_dir}/externalscripts %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_mandir}/man8/zabbix_proxy.8* %{_unitdir}/zabbix-proxy.service -%{_prefix}/lib/tmpfiles.d/zabbix-proxy.conf +%{_tmpfilesdir}/zabbix-proxy.conf %{_sbindir}/zabbix_proxy_pgsql %pre proxy-pgsql @@ -1093,15 +1099,14 @@ fi %files proxy-sqlite3 %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%doc database/sqlite3/schema.sql.gz -%attr(0600,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf -%dir /usr/lib/zabbix/externalscripts +%attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf +%dir %{zabbix_script_dir}/externalscripts %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_mandir}/man8/zabbix_proxy.8* %{_unitdir}/zabbix-proxy.service -%{_prefix}/lib/tmpfiles.d/zabbix-proxy.conf +%{_tmpfilesdir}/zabbix-proxy.conf %{_sbindir}/zabbix_proxy_sqlite3 %pre proxy-sqlite3 @@ -1137,17 +1142,15 @@ fi %files server-mysql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%doc database/mysql/create.sql.gz -%doc database/mysql/double.sql %attr(0600,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf -%dir /usr/lib/zabbix/alertscripts -%dir /usr/lib/zabbix/externalscripts +%dir %{zabbix_script_dir}/alertscripts +%dir %{zabbix_script_dir}/externalscripts %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_mandir}/man8/zabbix_server.8* %{_unitdir}/zabbix-server.service -%{_prefix}/lib/tmpfiles.d/zabbix-server.conf +%{_tmpfilesdir}/zabbix-server.conf %{_sbindir}/zabbix_server_mysql %pre server-mysql @@ -1181,18 +1184,15 @@ fi %files server-pgsql %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%doc database/postgresql/create.sql.gz -%doc database/postgresql/double.sql -%doc database/postgresql/timescaledb.sql.gz %attr(0600,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf -%dir /usr/lib/zabbix/alertscripts -%dir /usr/lib/zabbix/externalscripts +%dir %{zabbix_script_dir}/alertscripts +%dir %{zabbix_script_dir}/externalscripts %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_mandir}/man8/zabbix_server.8* %{_unitdir}/zabbix-server.service -%{_prefix}/lib/tmpfiles.d/zabbix-server.conf +%{_tmpfilesdir}/zabbix-server.conf %{_sbindir}/zabbix_server_pgsql %pre server-pgsql @@ -1228,16 +1228,30 @@ fi %defattr(-,root,root,-) %dir %{_sysconfdir}/zabbix/web %ghost %config(noreplace) %{_sysconfdir}/zabbix/web/zabbix.conf.php -%if 0%{?rhel} >= 8 -%config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf -%endif %doc AUTHORS ChangeLog COPYING NEWS README %config(noreplace) %{_sysconfdir}/zabbix/web/maintenance.inc.php %{_datadir}/zabbix +%files web-deps +%config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf + %files web-japanese %defattr(-,root,root,-) +%files web-mysql +%defattr(-,root,root,-) + +%files web-pgsql +%defattr(-,root,root,-) + +%files apache-conf +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf + +%files nginx-conf +%defattr(-,root,root,-) +%config(noreplace) %{_sysconfdir}/nginx/conf.d/zabbix.conf + %post web # The fonts directory was moved into assets subdirectory at one point. # @@ -1254,55 +1268,26 @@ then rm %{_datadir}/zabbix/fonts/graphfont.ttf fi fi +%if 0%{?rhel} >= 9 +# remove bad link to fonts/dejavu/DejaVuSans.ttf during upgrade on rhel 9 +if [ "$1" = 2 ]; then + /usr/sbin/update-alternatives --remove zabbix-web-font \ + %{_datadir}/fonts/dejavu/DejaVuSans.ttf +fi +%endif /usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf \ +%if 0%{?rhel} >= 9 + zabbix-web-font %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf 10 +%else zabbix-web-font %{_datadir}/fonts/dejavu/DejaVuSans.ttf 10 +%endif : %post web-japanese /usr/sbin/update-alternatives --install %{_datadir}/zabbix/assets/fonts/graphfont.ttf zabbix-web-font \ -%if 0%{?rhel} >= 8 %{_datadir}/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc 20 -%else - %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf 20 -%endif -: - -%preun web -if [ "$1" = 0 ]; then -/usr/sbin/update-alternatives --remove zabbix-web-font \ - %{_datadir}/fonts/dejavu/DejaVuSans.ttf -fi -: - -%preun web-japanese -if [ "$1" = 0 ]; then -/usr/sbin/update-alternatives --remove zabbix-web-font \ -%if 0%{?rhel} >= 8 - %{_datadir}/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc -%else - %{_datadir}/fonts/vlgothic/VL-PGothic-Regular.ttf -%endif -fi : -%if 0%{?rhel} > 7 -%files web-deps -%config(noreplace) %{_sysconfdir}/php-fpm.d/zabbix.conf - -%files web-mysql -%defattr(-,root,root,-) - -%files web-pgsql -%defattr(-,root,root,-) - -%files apache-conf -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf - -%files nginx-conf -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/nginx/conf.d/zabbix.conf - # The user apache must be available for these to work. # It is provided by httpd or php-fpm packages. %post apache-conf @@ -1316,44 +1301,26 @@ if [ -d /etc/zabbix/web ]; then chown apache:apache /etc/zabbix/web/ fi : -%endif -%if 0%{?rhel} == 7 -%files web-deps-scl -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/opt/rh/rh-php72/php-fpm.d/zabbix.conf - -%files web-deps-scl-php73 -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/opt/rh/rh-php73/php-fpm.d/zabbix.conf - -%files web-mysql-scl -%defattr(-,root,root,-) - -%files web-mysql-scl-php73 -%defattr(-,root,root,-) - -%files web-pgsql-scl -%defattr(-,root,root,-) - -%files web-pgsql-scl-php73 -%defattr(-,root,root,-) - -%files apache-conf-scl -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf - -%files nginx-conf-scl -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/opt/rh/rh-nginx116/nginx/conf.d/zabbix.conf +%preun web +if [ "$1" = 0 ]; then +%if 0%{?rhel} >= 9 +/usr/sbin/update-alternatives --remove zabbix-web-font \ + %{_datadir}/fonts/dejavu-sans-fonts/DejaVuSans.ttf +%else +/usr/sbin/update-alternatives --remove zabbix-web-font \ + %{_datadir}/fonts/dejavu/DejaVuSans.ttf +%endif +fi +: -%post web-deps-scl -if [ -d /etc/zabbix/web ]; then - chown apache:apache /etc/zabbix/web/ +%preun web-japanese +if [ "$1" = 0 ]; then +/usr/sbin/update-alternatives --remove zabbix-web-font \ + %{_datadir}/fonts/google-noto-cjk/NotoSansCJK-Regular.ttc fi : %endif -%endif %if 0%{?build_java_gateway} @@ -1364,9 +1331,10 @@ fi %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix %{_datadir}/zabbix-java-gateway -%{_sbindir}/zabbix_java_gateway +%{_sbindir}/zabbix_java_gateway_startup +%{_sbindir}/zabbix_java_gateway_shutdown %{_unitdir}/zabbix-java-gateway.service -%{_prefix}/lib/tmpfiles.d/zabbix-java-gateway.conf +%{_tmpfilesdir}/zabbix-java-gateway.conf %config(noreplace) %{_sysconfdir}/zabbix/zabbix_java_gateway_logback.xml %pre java-gateway @@ -1392,115 +1360,252 @@ fi %endif -# -# changelog -# +%if 0%{?build_selinux_policy} +%files selinux-policy +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README +%{_datadir}/selinux/packages/zabbix/zabbix_policy.pp + + +%post selinux-policy +semodule -i %{_datadir}/selinux/packages/zabbix/zabbix_policy.pp +: + +%postun selinux-policy +if [ $1 = 0 ] && semodule -l | grep -q zabbix_policy; then semodule -r zabbix_policy; fi +: +%endif + %changelog -* Thu Sep 15 2022 Fabian Arrotin - 5.0.27-2 -- disabling agent2 build due to missing BuildRequires (not fetching GO from internet) +* Mon Dec 05 2022 Zabbix Packager - 6.0.12-release1 +- update to 6.0.12 + +* Fri Dec 02 2022 Zabbix Packager - 6.0.12-rc2.release1 +- update to 6.0.12rc2 + +* Thu Dec 01 2022 Zabbix Packager - 6.0.12-rc1.release1 +- update to 6.0.12rc1 + +* Mon Nov 28 2022 Zabbix Packager - 6.0.11-release1 +- update to 6.0.11 + +* Fri Nov 25 2022 Zabbix Packager - 6.0.11-rc2.release1 +- update to 6.0.11rc2 + +* Mon Nov 21 2022 Zabbix Packager - 6.0.11-rc1.release1 +- update to 6.0.11rc1 + +* Wed Nov 16 2022 Zabbix Packager - 6.0.10-release2 +- added explicit dependencies on mongodb and postgresql plugins to agent2; to ease upgrade + +* Wed Nov 02 2022 Zabbix Packager - 6.0.10-release1 +- update to 6.0.10 + +* Thu Oct 27 2022 Zabbix Packager - 6.0.10-rc2.release1 +- update to 6.0.10rc2 -* Mon Aug 29 2022 Zabbix Packager - 5.0.27-1 -- update to 5.0.27 +* Tue Oct 25 2022 Zabbix Packager - 6.0.10-rc1.release1 +- update to 6.0.10rc1 +- removed agent2 builtin postgres.conf file; to be replaced with a plugin -* Mon Jul 25 2022 Zabbix Packager - 5.0.26-1 -- update to 5.0.26 +* Wed Sep 21 2022 Zabbix Packager - 6.0.9-release1 +- update to 6.0.9 -* Mon Jun 27 2022 Zabbix Packager - 5.0.25-1 -- update to 5.0.25 +* Mon Sep 19 2022 Zabbix Packager - 6.0.9-rc2.release1 +- update to 6.0.9rc2 + +* Wed Sep 14 2022 Zabbix Packager - 6.0.9-rc1.release1 +- update to 6.0.9rc1 +- moved zabbix-sql-scripts contents out of system documentation and into data directory +- added new postgresql files to sql-scripts package + +* Tue Aug 30 2022 Zabbix Packager - 6.0.8-release2 +- second release of 6.0.8 for rhel-9 +- fixed path to DejaVuSans font + +* Mon Aug 29 2022 Zabbix Packager - 6.0.8-release1 +- update to 6.0.8 +- added "release" prefix to package version + +* Mon Jul 25 2022 Zabbix Packager - 6.0.7-1 +- update to 6.0.7 + +* Wed Jun 29 2022 Zabbix Packager - 6.0.6-2 +- fixed postun selinux-policy scriptlet + +* Mon Jun 27 2022 Zabbix Packager - 6.0.6-1 +- update to 6.0.6 +- removed mongodb from agent2, expecting to use external plugin +- reverted /run to /var/run in conf files using patches 6 & 7 for rhel <= 6 - fixed bogus systemd scriptlet for agent2 on rhel < 7 - silencing agent2 interactive output on rhel 6 (ZBX-20456) -* Mon May 30 2022 Zabbix Packager - 5.0.24-1 -- update to 5.0.24 +* Mon May 30 2022 Zabbix Packager - 6.0.5-1 +- update to 6.0.5 - added After=postgresql-14.service to server and proxy systemd service files -* Mon May 02 2022 Zabbix Packager - 5.0.23-1 -- update to 5.0.23 +* Tue May 03 2022 Zabbix Packager - 6.0.4-1 +- update to 6.0.4 - added rhel6-go11.6.patch +- replaced /var/run with /run +- updated selinux-policy to allow web servers connecting to postgres via socket +- fixed selinux-policy postun scriptlet + +* Mon Apr 04 2022 Zabbix Packager - 6.0.3-1 +- update to 6.0.3 + +* Mon Mar 14 2022 Zabbix Packager - 6.0.2-1 +- update to 6.0.2 + +* Tue Mar 01 2022 Zabbix Packager - 6.0.1-1 +- update to 6.0.1 +- fixed EnvironmentFile setting in web-service systemd service file + +* Mon Feb 14 2022 Zabbix Packager - 6.0.0-1 +- update to 6.0.0 + +* Fri Feb 04 2022 Zabbix Packager - 6.0.0-0.12rc2 +- update to 6.0.0rc2 + +* Tue Feb 01 2022 Zabbix Packager - 6.0.0-0.11rc1 +- update to 6.0.0rc1 + +* Tue Jan 25 2022 Zabbix Packager - 6.0.0-0.10beta3 +- update to 6.0.0beta3 -* Mon Apr 04 2022 Zabbix Packager - 5.0.22-1 -- update to 5.0.22 +* Tue Jan 11 2022 Zabbix Packager - 6.0.0-0.9beta2 +- update to 6.0.0beta2 +- using pcre2 on rhel >= 7 +- added history_pk_prepare.sql to sql-scripts package -* Mon Feb 28 2022 Zabbix Packager - 5.0.21-1 -- update to 5.0.21 +* Mon Dec 13 2021 Zabbix Packager - 6.0.0-0.8beta1 +- update to 6.0.0beta1 +- removed erronious references to tmpfiles.d on rhel < 7 and fixed _tmpfilesdir macro usage +- removed "Obsoletes: zabbix" for web-servce sub-package +- renamed create.sql.gz to server.sql.gz +- renamed schema.sql to proxy.sql +- compressing only server.sql.gz -* Mon Jan 31 2022 Zabbix Packager - 5.0.20-1 -- update to 5.0.20 +* Mon Nov 22 2021 Zabbix Packager - 6.0.0-0.7alpha7 +- update to 6.0.0alpha7 -* Thu Dec 23 2021 Zabbix Packager - 5.0.19-1 -- update to 5.0.19 +* Tue Nov 09 2021 Zabbix Packager - 6.0.0-0.6alpha6 +- update to 6.0.0alpha6 -* Mon Nov 29 2021 Zabbix Packager - 5.0.18-1 -- update to 5.0.18 +* Mon Oct 25 2021 Zabbix Packager - 6.0.0-0.5alpha5 +- update to 6.0.0alpha5 +- separated agent2 plugin conf files (ZBXNEXT-6428) +- updated php-fpm conf files (ZBX-20106) -* Mon Oct 18 2021 Zabbix Packager - 5.0.17-1 -- update to 5.0.17 +* Wed Oct 06 2021 Zabbix Packager - 6.0.0-0.4alpha4 +- update to 6.0.0alpha4 -* Wed Sep 29 2021 Zabbix Packager - 5.0.16-1 -- update to 5.0.16 +* Mon Sep 20 2021 Zabbix Packager - 6.0.0-0.3alpha3 +- update to 6.0.0alpha3 -* Mon Aug 30 2021 Zabbix Packager - 5.0.15-1 -- update to 5.0.15 +* Mon Sep 06 2021 Zabbix Packager - 6.0.0-0.2alpha2 +- update to 6.0.0alpha2 -* Mon Jul 19 2021 Zabbix Packager - 5.0.14-1 -- update to 5.0.14 +* Wed Aug 25 2021 Zabbix Packager - 6.0.0-0.1alpha1 +- update to 6.0.0alpha1 +- added selinux-policy package (rhel 7+) -* Mon Jun 28 2021 Zabbix Packager - 5.0.13-1 -- update to 5.0.13 +* Wed Jul 21 2021 Zabbix Packager - 5.4.3-1 +- update to 5.4.3 + +* Mon Jun 28 2021 Zabbix Packager - 5.4.2-1 +- update to 5.4.2 + +* Mon Jun 07 2021 Zabbix Packager - 5.4.1-1 +- update to 5.4.1 +- removed bogus PIDFile from zabbix-web-service.service file +- using conditionals around sub-package definition blocks; fixed wrong arch in rhel-5 package names - denying web server access to vendor subdir in /usr/share/zabbix - renamed config.patch to frontend.patch - replaced conf file sed substitutions with patches -* Mon May 24 2021 Zabbix Packager - 5.0.12-1 -- update to 5.0.12 +* Thu May 27 2021 Zabbix Packager - 5.4.0-9 +- second build of 5.4.0 agent2 +- fixed LogFile path substitution for agent2 + +* Fri May 14 2021 Zabbix Packager - 5.4.0-8 +- update to 5.4.0 +- setting EXTERNAL_SCRIPTS_PATH and ALERT_SCRIPTS_PATH make variables to /usr/lib/zabbix/* -* Mon Apr 26 2021 Zabbix Packager - 5.0.11-1 -- update to 5.0.11 +* Thu May 13 2021 Zabbix Packager - 5.4.0-0.8rc2 +- update to 5.4.0rc2 -* Mon Mar 29 2021 Zabbix Packager - 5.0.10-1 -- update to 5.0.10 +* Tue May 11 2021 Zabbix Packager - 5.4.0-0.7rc1 +- update to 5.4.0rc1 + +* Mon Apr 26 2021 Zabbix Packager - 5.4.0-0.6beta3 +- update to 5.4.0beta3 +- added zabbix-web-service package (ZBXNEXT-6480) + +* Thu Mar 11 2021 Zabbix Packager - 5.4.0-0.5beta2 +- update to 5.4.0beta2 +- fixed errors and warnings reported by rpmlint - added ProxyTimeout 300 to apache config, when running with php-fpm +- removed database subdir from sql-scripts package - added After=postgresql-13.service to server & proxy service files -* Mon Feb 22 2021 Zabbix Packager - 5.0.9-1 -- update to 5.0.9 - -* Wed Jan 27 2021 Zabbix Packager - 5.0.8-4 -- fourth release of 5.0.8 for rhel/centos 7 (frontend packages only) -- added missing zabbix-web-japanese package +* Mon Mar 01 2021 Zabbix Packager - 5.4.0-0.4beta1 +- update to 5.4.0beta1 -* Wed Jan 27 2021 Zabbix Packager - 5.0.8-3 -- third release of 5.0.8 for rhel/centos 7 (frontend packages only) -- added missing semicolon in /etc/opt/rh/rh-nginx116/nginx/conf.d/zabbix.conf file +* Thu Feb 18 2021 Zabbix Packager - 5.4.0-0.3alpha2 +- update to 5.4.0alpha2 +- updated java-gateway package to use startup and shutdown scripts from zabbix sources -* Wed Jan 27 2021 Zabbix Packager - 5.0.8-2 -- second release of 5.0.8 for rhel/centos 7 (frontend packages only) -- zabbix-web-deps-scl-php73 now provides zabbix-web-deps-scl explicitly so that the old package can be uninstalled +* Thu Jan 28 2021 Zabbix Packager - 5.4.0-0.2alpha1 +- second build of 5.4.0alpha1 +- fixed BuildArch and files section for zabbix-sql-scripts package -* Mon Jan 25 2021 Zabbix Packager - 5.0.8-1 -- update to 5.0.8 +* Thu Jan 28 2021 Zabbix Packager - 5.4.0-0.1alpha1 +- update to 5.4.0alpha1 - reworked spec file to allow selecting which packages are being built via macros (ZBX-18826) -- added rhel-7 frontend packages with rh-php73 (ZBX-18837) -* Mon Dec 21 2020 Zabbix Packager - 5.0.7-1 -- update to 5.0.7 +* Mon Dec 21 2020 Zabbix Packager - 5.2.3-1 +- update to 5.2.3 -* Mon Nov 30 2020 Zabbix Packager - 5.0.6-1 -- update to 5.0.6 +* Mon Nov 30 2020 Zabbix Packager - 5.2.2-1 +- update to 5.2.2 +- added proxy and java-gateway to rhel-7 -* Mon Oct 26 2020 Zabbix Packager - 5.0.5-1 -- update to 5.0.5 +* Fri Oct 30 2020 Zabbix Packager - 5.2.1-1 +- update to 5.2.1 -* Mon Sep 28 2020 Zabbix Packager - 5.0.4-1 -- update to 5.0.4 +* Mon Oct 26 2020 Zabbix Packager - 5.2.0-1 +- update to 5.2.0 + +* Thu Oct 22 2020 Zabbix Packager - 5.2.0-0.7rc2 +- update to 5.2.0rc2 + +* Tue Oct 20 2020 Zabbix Packager - 5.2.0-0.6rc1 +- update to 5.2.0rc1 + +* Mon Oct 12 2020 Zabbix Packager - 5.2.0-0.5beta2 +- update to 5.2.0beta2 + +* Mon Sep 28 2020 Zabbix Packager - 5.2.0-0.4beta1 +- update to 5.2.0beta1 +- added User=zabbix & Group=zabbix to all service files + +* Mon Sep 14 2020 Zabbix Packager - 5.2.0-0.3alpha3 +- update to 5.2.0alpha3 - added separate zabbix-web-deps package +- doing hardened builds on rhel >= 8 +- removed libyaml.patch +- overriding ExternalScripts & AlertScriptsPath in binaries instead of config files (ZBX-17983) + +* Mon Aug 31 2020 Zabbix Packager - 5.2.0-0.2alpha2 +- update to 5.2.0alpha2 +- building only agent, sender & get packages on rhel <= 7 - creating empty log file for agent2 (ZBX-18243) -- reverted ZBX-18221 changes from 5.0.3-1 on rhel/centos 7 -* Mon Aug 24 2020 Zabbix Packager - 5.0.3-1 -- update to 5.0.3 -- building server and proxy with postgresql 12 on rhel/centos 7 (ZBX-18221) +* Mon Aug 17 2020 Zabbix Packager - 5.2.0-0.1alpha1 +- update to 5.2.0alpha1 +- building server and proxy with mysql 8 & postgresql 12 on rhel/centos 7 (ZBX-18221) - added various After=postgresql* directives to server & proxy service files (ZBX-17492) * Mon Jul 13 2020 Zabbix Packager - 5.0.2-1