-diff -ur zabbix-5.0.7.orig/conf/zabbix_agentd.conf zabbix-5.0.7/conf/zabbix_agentd.conf
---- zabbix-5.0.7.orig/conf/zabbix_agentd.conf 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_agentd.conf 2021-01-03 22:16:31.046106105 +0100
+diff -ur zabbix-6.0.25.orig/conf/zabbix_agentd.conf zabbix-6.0.25/conf/zabbix_agentd.conf
+--- zabbix-6.0.25.orig/conf/zabbix_agentd.conf 2023-12-13 09:17:32.000000000 +0100
++++ zabbix-6.0.25/conf/zabbix_agentd.conf 2024-01-11 00:18:54.065715198 +0100
@@ -8,7 +8,7 @@
#
# Mandatory: no
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -296,15 +296,12 @@
+@@ -309,15 +309,12 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
####### USER-DEFINED MONITORED PARAMETERS #######
-diff -ur zabbix-5.0.7.orig/conf/zabbix_proxy.conf zabbix-5.0.7/conf/zabbix_proxy.conf
---- zabbix-5.0.7.orig/conf/zabbix_proxy.conf 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_proxy.conf 2021-01-03 22:17:05.509106105 +0100
-@@ -88,7 +88,7 @@
+diff -ur zabbix-6.0.25.orig/conf/zabbix_proxy.conf zabbix-6.0.25/conf/zabbix_proxy.conf
+--- zabbix-6.0.25.orig/conf/zabbix_proxy.conf 2023-12-13 09:17:32.000000000 +0100
++++ zabbix-6.0.25/conf/zabbix_proxy.conf 2024-01-11 00:18:54.065715198 +0100
+@@ -81,7 +81,7 @@
# Default:
# LogFile=
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -136,7 +136,7 @@
+@@ -129,7 +129,7 @@
#
# Mandatory: no
# Default:
### Option: SocketDir
# IPC socket directory.
-@@ -578,15 +578,12 @@
+@@ -605,15 +605,12 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
### Option: SSLCertLocation
# Location of SSL client certificates.
-diff -ur zabbix-5.0.7.orig/conf/zabbix_server.conf zabbix-5.0.7/conf/zabbix_server.conf
---- zabbix-5.0.7.orig/conf/zabbix_server.conf 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/conf/zabbix_server.conf 2021-01-03 22:17:13.072106105 +0100
+diff -ur zabbix-6.0.25.orig/conf/zabbix_server.conf zabbix-6.0.25/conf/zabbix_server.conf
+--- zabbix-6.0.25.orig/conf/zabbix_server.conf 2023-12-13 09:17:32.000000000 +0100
++++ zabbix-6.0.25/conf/zabbix_server.conf 2024-01-11 00:18:54.065715198 +0100
@@ -35,7 +35,7 @@
# Default:
# LogFile=
### Option: SocketDir
# IPC socket directory.
-@@ -612,15 +612,12 @@
+@@ -654,15 +654,12 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
### Option: SSLCertLocation
# Location of SSL client certificates.
-diff -ur zabbix-5.0.7.orig/src/zabbix_agent/zabbix_agentd.c zabbix-5.0.7/src/zabbix_agent/zabbix_agentd.c
---- zabbix-5.0.7.orig/src/zabbix_agent/zabbix_agentd.c 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_agent/zabbix_agentd.c 2021-01-03 22:04:59.483106105 +0100
-@@ -598,7 +598,7 @@
+diff -ur zabbix-6.0.25.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.25/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-6.0.25.orig/src/go/cmd/zabbix_web_service/config.go 2023-12-13 09:17:16.000000000 +0100
++++ zabbix-6.0.25/src/go/cmd/zabbix_web_service/config.go 2024-01-11 00:28:57.120343885 +0100
+@@ -25,7 +25,7 @@
+ ListenPort string `conf:"optional,range=1024:32767,default=10053"`
+ AllowedIP string `conf:"optional"`
+ LogType string `conf:"optional,default=file"`
+- LogFile string `conf:"optional,default=/tmp/zabbix_web_service.log"`
++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_web_service.log"`
+ LogFileSize int `conf:"optional,range=0:1024,default=1"`
+ Timeout int `conf:"optional,range=1:30,default=3"`
+ DebugLevel int `conf:"range=0:5,default=3"`
+diff -ur zabbix-6.0.25.orig/src/go/conf/mock_server.conf zabbix-6.0.25/src/go/conf/mock_server.conf
+--- zabbix-6.0.25.orig/src/go/conf/mock_server.conf 2023-12-13 09:17:29.000000000 +0100
++++ zabbix-6.0.25/src/go/conf/mock_server.conf 2024-01-11 00:29:17.508601798 +0100
+@@ -18,7 +18,7 @@
+ # Default:
+ # LogFile=
+
+-#LogFile=/tmp/zabbix_mock_server.log
++#LogFile=/var/log/zabbix/zabbix_mock_server.log
+
+ ### Option: DebugLevel
+ # Specifies debug level:
+diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.25/src/go/conf/zabbix_agent2.conf
+--- zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/src/go/conf/zabbix_agent2.conf 2024-01-11 00:27:56.657579028 +0100
+@@ -8,7 +8,7 @@
+ #
+ # Mandatory: no
+ # Default:
+-# PidFile=/tmp/zabbix_agent2.pid
++# PidFile=/var/run/zabbix/zabbix_agent2.pid
+
+ ### Option: LogType
+ # Specifies where log messages are written to:
+@@ -25,7 +25,7 @@
+ #
+ # Mandatory: yes, if LogType is set to file, otherwise no
+ # Default:
+-# LogFile=/tmp/zabbix_agent2.log
++# LogFile=/var/log/zabbix/zabbix_agent2.log
+
+ ### Option: LogFileSize
+ # Maximum size of log file in MB.
+@@ -272,9 +272,7 @@
+ # Default:
+ # Include=
+
+-# 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
++Include=/etc/zabbix/zabbix_agent2.conf.d/*.conf
+
+ ### Option:PluginTimeout
+ # Timeout for connections with external plugins.
+@@ -477,4 +475,4 @@
+ # ForceActiveChecksOnStart=0
+
+ # Include configuration files for plugins
+-Include=./zabbix_agent2.d/plugins.d/*.conf
++Include=/etc/zabbix/zabbix_agent2.d/plugins.d/*.conf
+diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.25/src/go/conf/zabbix_web_service.conf
+--- zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf 2023-12-13 09:17:29.000000000 +0100
++++ zabbix-6.0.25/src/go/conf/zabbix_web_service.conf 2024-01-11 00:29:05.116445036 +0100
+@@ -18,7 +18,7 @@
+ #
+ # Mandatory: yes, if LogType is set to file, otherwise no
+ # Default:
+-# LogFile=/tmp/zabbix_web_service.log
++# LogFile=/var/log/zabbix/zabbix_web_service.log
+
+ ### Option: LogFileSize
+ # Maximum size of log file in MB.
+diff -ur zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go zabbix-6.0.25/src/go/internal/agent/options_nix.go
+--- zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/src/go/internal/agent/options_nix.go 2024-01-11 00:31:22.998189252 +0100
+@@ -24,7 +24,7 @@
+
+ type AgentOptions struct {
+ LogType string `conf:"optional,default=file"`
+- LogFile string `conf:"optional,default=/tmp/zabbix_agent2.log"`
++ LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_agent2.log"`
+ LogFileSize int `conf:"optional,range=0:1024,default=1"`
+ DebugLevel int `conf:"optional,range=0:5,default=3"`
+ PidFile string `conf:"optional"`
+diff -ur zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go 2023-12-13 09:17:16.000000000 +0100
++++ zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go 2024-01-11 00:28:30.003000848 +0100
+@@ -31,7 +31,7 @@
+
+ func createPidFile(pid int, path string) (file *os.File, err error) {
+ if path == "" {
+- path = "/tmp/zabbix_agent2.pid"
++ path = "/var/run/zabbix/zabbix_agent2.pid"
+ }
+
+ flockT := syscall.Flock_t{
+diff -ur zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c 2024-01-11 00:18:54.066715211 +0100
+@@ -603,7 +603,7 @@
CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
if (NULL == CONFIG_PID_FILE)
#endif
if (NULL == CONFIG_LOG_TYPE_STR)
CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
-diff -ur zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml zabbix-5.0.7/src/zabbix_java/lib/logback.xml
---- zabbix-5.0.7.orig/src/zabbix_java/lib/logback.xml 2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_java/lib/logback.xml 2021-01-03 22:03:05.902106105 +0100
+diff -ur zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/zabbix_java/lib/logback.xml
+--- zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml 2023-12-13 09:17:17.000000000 +0100
++++ zabbix-6.0.25/src/zabbix_java/lib/logback.xml 2024-01-11 00:18:54.066715211 +0100
@@ -2,10 +2,10 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<minIndex>1</minIndex>
<maxIndex>3</maxIndex>
</rollingPolicy>
-diff -ur zabbix-5.0.7.orig/src/zabbix_java/settings.sh zabbix-5.0.7/src/zabbix_java/settings.sh
---- zabbix-5.0.7.orig/src/zabbix_java/settings.sh 2020-12-14 11:27:17.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_java/settings.sh 2021-01-03 22:03:05.902106105 +0100
+diff -ur zabbix-6.0.25.orig/src/zabbix_java/settings.sh zabbix-6.0.25/src/zabbix_java/settings.sh
+--- zabbix-6.0.25.orig/src/zabbix_java/settings.sh 2023-12-13 09:17:17.000000000 +0100
++++ zabbix-6.0.25/src/zabbix_java/settings.sh 2024-01-11 00:18:54.066715211 +0100
@@ -24,7 +24,7 @@
# Default:
# PID_FILE=
### Option: zabbix.startPollers
# Number of worker threads to start.
-diff -ur zabbix-5.0.7.orig/src/zabbix_proxy/proxy.c zabbix-5.0.7/src/zabbix_proxy/proxy.c
---- zabbix-5.0.7.orig/src/zabbix_proxy/proxy.c 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_proxy/proxy.c 2021-01-03 22:08:43.899106105 +0100
-@@ -474,7 +474,7 @@
+diff -ur zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c zabbix-6.0.25/src/zabbix_proxy/proxy.c
+--- zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/src/zabbix_proxy/proxy.c 2024-01-11 00:18:54.067715224 +0100
+@@ -515,7 +515,7 @@
CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
if (NULL == CONFIG_PID_FILE)
if (NULL == CONFIG_TMPDIR)
CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
-diff -ur zabbix-5.0.7.orig/src/zabbix_server/server.c zabbix-5.0.7/src/zabbix_server/server.c
---- zabbix-5.0.7.orig/src/zabbix_server/server.c 2020-12-21 10:38:31.000000000 +0100
-+++ zabbix-5.0.7/src/zabbix_server/server.c 2021-01-03 22:08:56.453106105 +0100
-@@ -482,7 +482,7 @@
+diff -ur zabbix-6.0.25.orig/src/zabbix_server/server.c zabbix-6.0.25/src/zabbix_server/server.c
+--- zabbix-6.0.25.orig/src/zabbix_server/server.c 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/src/zabbix_server/server.c 2024-01-11 00:18:54.067715224 +0100
+@@ -578,7 +578,7 @@
CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
if (NULL == CONFIG_PID_FILE)
if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DEFAULT_ALERT_SCRIPTS_PATH);
+diff -ur zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.25/ui/include/classes/core/CConfigFile.php
+--- zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/ui/include/classes/core/CConfigFile.php 2024-01-11 00:18:54.067715224 +0100
+@@ -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 -ur zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php zabbix-6.0.25/ui/include/classes/core/ZBase.php
+--- zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/ui/include/classes/core/ZBase.php 2024-01-11 00:18:54.139716136 +0100
+@@ -380,7 +380,7 @@
+ * @throws Exception
+ */
+ protected function setMaintenanceMode() {
+- require_once 'conf/maintenance.inc.php';
++ require_once '/etc/zabbix/web/maintenance.inc.php';
+
+ if (defined('ZBX_DENY_GUI_ACCESS')) {
+ if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
+@@ -393,7 +393,7 @@
+ * Load zabbix config file.
+ */
+ protected function loadConfigFile() {
+- $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH;
++ $configFile = CConfigFile::CONFIG_FILE_PATH;
+ $config = new CConfigFile($configFile);
+ $this->config = $config->load();
+ }
+diff -ur zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php 2023-12-13 09:17:33.000000000 +0100
++++ zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php 2024-01-11 00:18:54.139716136 +0100
+@@ -271,7 +271,7 @@
+ // make zabbix.conf.php downloadable
+ header('Content-Type: application/x-httpd-php');
+ header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');
+- $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH);
++ $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH);
+ $config->config = [
+ 'DB' => [
+ 'TYPE' => $this->getConfig('DB_TYPE'),
+@@ -821,7 +821,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' => [
TLD / packages / zabbix.git / blobdiff