1 diff -ur zabbix-6.0.25.orig/conf/zabbix_agentd.conf zabbix-6.0.25/conf/zabbix_agentd.conf
2 --- zabbix-6.0.25.orig/conf/zabbix_agentd.conf 2023-12-13 09:17:32.000000000 +0100
3 +++ zabbix-6.0.25/conf/zabbix_agentd.conf 2024-01-10 22:39:30.653744791 +0100
8 -# PidFile=/tmp/zabbix_agentd.pid
9 +# PidFile=/var/run/zabbix/zabbix_agentd.pid
12 # Specifies where log messages are written to:
17 -LogFile=/tmp/zabbix_agentd.log
18 +LogFile=/var/log/zabbix/zabbix_agentd.log
20 ### Option: LogFileSize
21 # Maximum size of log file in MB.
25 # You may include individual files or all files in a directory in the configuration file.
26 -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
32 -# Include=/usr/local/etc/zabbix_agentd.userparams.conf
33 -# Include=/usr/local/etc/zabbix_agentd.conf.d/
34 -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
35 +Include=/etc/zabbix/zabbix_agentd.conf.d/*.conf
37 ####### USER-DEFINED MONITORED PARAMETERS #######
39 diff -ur zabbix-6.0.25.orig/conf/zabbix_proxy.conf zabbix-6.0.25/conf/zabbix_proxy.conf
40 --- zabbix-6.0.25.orig/conf/zabbix_proxy.conf 2023-12-13 09:17:32.000000000 +0100
41 +++ zabbix-6.0.25/conf/zabbix_proxy.conf 2024-01-10 22:39:30.653744791 +0100
46 -LogFile=/tmp/zabbix_proxy.log
47 +LogFile=/var/log/zabbix/zabbix_proxy.log
49 ### Option: LogFileSize
50 # Maximum size of log file in MB.
55 -# PidFile=/tmp/zabbix_proxy.pid
56 +# PidFile=/var/run/zabbix/zabbix_proxy.pid
59 # IPC socket directory.
63 # You may include individual files or all files in a directory in the configuration file.
64 -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
70 -# Include=/usr/local/etc/zabbix_proxy.general.conf
71 -# Include=/usr/local/etc/zabbix_proxy.conf.d/
72 -# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
73 +Include=/etc/zabbix/zabbix_proxy.conf.d/*.conf
75 ### Option: SSLCertLocation
76 # Location of SSL client certificates.
77 diff -ur zabbix-6.0.25.orig/conf/zabbix_server.conf zabbix-6.0.25/conf/zabbix_server.conf
78 --- zabbix-6.0.25.orig/conf/zabbix_server.conf 2023-12-13 09:17:32.000000000 +0100
79 +++ zabbix-6.0.25/conf/zabbix_server.conf 2024-01-10 22:39:30.653744791 +0100
84 -LogFile=/tmp/zabbix_server.log
85 +LogFile=/var/log/zabbix/zabbix_server.log
87 ### Option: LogFileSize
88 # Maximum size of log file in MB.
93 -# PidFile=/tmp/zabbix_server.pid
94 +# PidFile=/var/run/zabbix/zabbix_server.pid
97 # IPC socket directory.
101 # You may include individual files or all files in a directory in the configuration file.
102 -# Installing Zabbix will create include directory in /usr/local/etc, unless modified during the compile time.
108 -# Include=/usr/local/etc/zabbix_server.general.conf
109 -# Include=/usr/local/etc/zabbix_server.conf.d/
110 -# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
111 +Include=/etc/zabbix/zabbix_server.conf.d/*.conf
113 ### Option: SSLCertLocation
114 # Location of SSL client certificates.
115 diff -ur zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c
116 --- zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c 2023-12-13 09:17:33.000000000 +0100
117 +++ zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c 2024-01-10 22:39:30.654744803 +0100
119 CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
121 if (NULL == CONFIG_PID_FILE)
122 - CONFIG_PID_FILE = (char *)"/tmp/zabbix_agentd.pid";
123 + CONFIG_PID_FILE = (char *)"/var/run/zabbix/zabbix_agentd.pid";
125 if (NULL == CONFIG_LOG_TYPE_STR)
126 CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
127 diff -ur zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/zabbix_java/lib/logback.xml
128 --- zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml 2023-12-13 09:17:17.000000000 +0100
129 +++ zabbix-6.0.25/src/zabbix_java/lib/logback.xml 2024-01-10 22:39:30.654744803 +0100
132 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
134 - <file>/tmp/zabbix_java.log</file>
135 + <file>/var/log/zabbix/zabbix_java.log</file>
137 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
138 - <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
139 + <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
140 <minIndex>1</minIndex>
141 <maxIndex>3</maxIndex>
143 diff -ur zabbix-6.0.25.orig/src/zabbix_java/settings.sh zabbix-6.0.25/src/zabbix_java/settings.sh
144 --- zabbix-6.0.25.orig/src/zabbix_java/settings.sh 2023-12-13 09:17:17.000000000 +0100
145 +++ zabbix-6.0.25/src/zabbix_java/settings.sh 2024-01-10 22:39:30.654744803 +0100
150 -PID_FILE="/tmp/zabbix_java.pid"
151 +PID_FILE="/var/run/zabbix/zabbix_java.pid"
153 ### Option: zabbix.startPollers
154 # Number of worker threads to start.
155 diff -ur zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c zabbix-6.0.25/src/zabbix_proxy/proxy.c
156 --- zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c 2023-12-13 09:17:33.000000000 +0100
157 +++ zabbix-6.0.25/src/zabbix_proxy/proxy.c 2024-01-10 22:39:30.655744816 +0100
159 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
161 if (NULL == CONFIG_PID_FILE)
162 - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid");
163 + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid");
165 if (NULL == CONFIG_TMPDIR)
166 CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
167 diff -ur zabbix-6.0.25.orig/src/zabbix_server/server.c zabbix-6.0.25/src/zabbix_server/server.c
168 --- zabbix-6.0.25.orig/src/zabbix_server/server.c 2023-12-13 09:17:33.000000000 +0100
169 +++ zabbix-6.0.25/src/zabbix_server/server.c 2024-01-10 22:39:30.655744816 +0100
171 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
173 if (NULL == CONFIG_PID_FILE)
174 - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid");
175 + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid");
177 if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
178 CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DEFAULT_ALERT_SCRIPTS_PATH);
179 diff -ur zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.25/ui/include/classes/core/CConfigFile.php
180 --- zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php 2023-12-13 09:17:33.000000000 +0100
181 +++ zabbix-6.0.25/ui/include/classes/core/CConfigFile.php 2024-01-10 22:39:30.655744816 +0100
183 const CONFIG_ERROR = 2;
184 const CONFIG_VAULT_ERROR = 3;
186 - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php';
187 + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php';
189 private static $supported_db_types = [
190 ZBX_DB_MYSQL => true,
191 diff -ur zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php zabbix-6.0.25/ui/include/classes/core/ZBase.php
192 --- zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php 2023-12-13 09:17:33.000000000 +0100
193 +++ zabbix-6.0.25/ui/include/classes/core/ZBase.php 2024-01-10 22:39:30.754746056 +0100
197 protected function setMaintenanceMode() {
198 - require_once 'conf/maintenance.inc.php';
199 + require_once '/etc/zabbix/web/maintenance.inc.php';
201 if (defined('ZBX_DENY_GUI_ACCESS')) {
202 if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
204 * Load zabbix config file.
206 protected function loadConfigFile() {
207 - $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH;
208 + $configFile = CConfigFile::CONFIG_FILE_PATH;
209 $config = new CConfigFile($configFile);
210 $this->config = $config->load();
212 diff -ur zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php
213 --- zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php 2023-12-13 09:17:33.000000000 +0100
214 +++ zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php 2024-01-10 22:39:30.754746056 +0100
216 // make zabbix.conf.php downloadable
217 header('Content-Type: application/x-httpd-php');
218 header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');
219 - $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH);
220 + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH);
223 'TYPE' => $this->getConfig('DB_TYPE'),
226 $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
228 - $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
229 + $config_file_name = CConfigFile::CONFIG_FILE_PATH;
230 $config = new CConfigFile($config_file_name);