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 # Default: -# PidFile=/tmp/zabbix_agentd.pid +# PidFile=/var/run/zabbix/zabbix_agentd.pid ### Option: LogType # Specifies where log messages are written to: @@ -27,7 +27,7 @@ # Default: # LogFile= -LogFile=/tmp/zabbix_agentd.log +LogFile=/var/log/zabbix/zabbix_agentd.log ### Option: LogFileSize # Maximum size of log file in MB. @@ -309,15 +309,12 @@ ### Option: Include # You may include individual files or all files in a directory in the configuration file. -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time. # # Mandatory: no # Default: # Include= -# Include=/usr/local/etc/zabbix_agentd.userparams.conf -# Include=/usr/local/etc/zabbix_agentd.conf.d/ -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf +Include=/etc/zabbix/zabbix_agentd.conf.d/*.conf ####### USER-DEFINED MONITORED PARAMETERS ####### 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= -LogFile=/tmp/zabbix_proxy.log +LogFile=/var/log/zabbix/zabbix_proxy.log ### Option: LogFileSize # Maximum size of log file in MB. @@ -129,7 +129,7 @@ # # Mandatory: no # Default: -# PidFile=/tmp/zabbix_proxy.pid +# PidFile=/var/run/zabbix/zabbix_proxy.pid ### Option: SocketDir # IPC socket directory. @@ -605,15 +605,12 @@ ### 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 +Include=/etc/zabbix/zabbix_proxy.conf.d/*.conf ### Option: SSLCertLocation # Location of SSL client certificates. 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= -LogFile=/tmp/zabbix_server.log +LogFile=/var/log/zabbix/zabbix_server.log ### Option: LogFileSize # Maximum size of log file in MB. @@ -65,7 +65,7 @@ # # Mandatory: no # Default: -# PidFile=/tmp/zabbix_server.pid +# PidFile=/var/run/zabbix/zabbix_server.pid ### Option: SocketDir # IPC socket directory. @@ -654,15 +654,12 @@ ### 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 +Include=/etc/zabbix/zabbix_server.conf.d/*.conf ### Option: SSLCertLocation # Location of SSL client certificates. 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) - CONFIG_PID_FILE = (char *)"/tmp/zabbix_agentd.pid"; + CONFIG_PID_FILE = (char *)"/var/run/zabbix/zabbix_agentd.pid"; #endif if (NULL == CONFIG_LOG_TYPE_STR) CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE); 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 @@ - /tmp/zabbix_java.log + /var/log/zabbix/zabbix_java.log - /tmp/zabbix_java.log.%i + /var/log/zabbix/zabbix_java.log.%i 1 3 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= -PID_FILE="/tmp/zabbix_java.pid" +PID_FILE="/var/run/zabbix/zabbix_java.pid" ### Option: zabbix.startPollers # Number of worker threads to start. 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) - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid"); + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid"); if (NULL == CONFIG_TMPDIR) CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp"); 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) - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid"); + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid"); 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' => [