1 diff -ur zabbix-6.0.30.orig/conf/zabbix_agentd.conf zabbix-6.0.30/conf/zabbix_agentd.conf
2 --- zabbix-6.0.30.orig/conf/zabbix_agentd.conf 2024-05-21 08:57:56.000000000 +0200
3 +++ zabbix-6.0.30/conf/zabbix_agentd.conf 2024-06-13 13:24:11.947817181 +0200
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.30.orig/conf/zabbix_proxy.conf zabbix-6.0.30/conf/zabbix_proxy.conf
40 --- zabbix-6.0.30.orig/conf/zabbix_proxy.conf 2024-05-21 08:57:56.000000000 +0200
41 +++ zabbix-6.0.30/conf/zabbix_proxy.conf 2024-06-13 13:24:12.411823745 +0200
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.30.orig/conf/zabbix_server.conf zabbix-6.0.30/conf/zabbix_server.conf
78 --- zabbix-6.0.30.orig/conf/zabbix_server.conf 2024-05-21 08:57:56.000000000 +0200
79 +++ zabbix-6.0.30/conf/zabbix_server.conf 2024-06-13 13:24:12.415823801 +0200
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.30.orig/src/go/cmd/zabbix_web_service/config.go zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go
116 --- zabbix-6.0.30.orig/src/go/cmd/zabbix_web_service/config.go 2024-05-21 08:57:51.000000000 +0200
117 +++ zabbix-6.0.30/src/go/cmd/zabbix_web_service/config.go 2024-06-13 13:24:12.415823801 +0200
119 ListenPort string `conf:"optional,range=1024:32767,default=10053"`
120 AllowedIP string `conf:"optional"`
121 LogType string `conf:"optional,default=file"`
122 - LogFile string `conf:"optional,default=/tmp/zabbix_web_service.log"`
123 + LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_web_service.log"`
124 LogFileSize int `conf:"optional,range=0:1024,default=1"`
125 Timeout int `conf:"optional,range=1:30,default=3"`
126 DebugLevel int `conf:"range=0:5,default=3"`
127 diff -ur zabbix-6.0.30.orig/src/go/conf/mock_server.conf zabbix-6.0.30/src/go/conf/mock_server.conf
128 --- zabbix-6.0.30.orig/src/go/conf/mock_server.conf 2024-05-21 08:57:51.000000000 +0200
129 +++ zabbix-6.0.30/src/go/conf/mock_server.conf 2024-06-13 13:24:12.415823801 +0200
134 -#LogFile=/tmp/zabbix_mock_server.log
135 +#LogFile=/var/log/zabbix/zabbix_mock_server.log
137 ### Option: DebugLevel
138 # Specifies debug level:
139 diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.30/src/go/conf/zabbix_agent2.conf
140 --- zabbix-6.0.30.orig/src/go/conf/zabbix_agent2.conf 2024-05-21 08:57:56.000000000 +0200
141 +++ zabbix-6.0.30/src/go/conf/zabbix_agent2.conf 2024-06-13 13:24:12.415823801 +0200
146 -# PidFile=/tmp/zabbix_agent2.pid
147 +# PidFile=/var/run/zabbix/zabbix_agent2.pid
150 # Specifies where log messages are written to:
153 # Mandatory: yes, if LogType is set to file, otherwise no
155 -# LogFile=/tmp/zabbix_agent2.log
156 +# LogFile=/var/log/zabbix/zabbix_agent2.log
158 ### Option: LogFileSize
159 # Maximum size of log file in MB.
164 -# Include=/usr/local/etc/zabbix_agent2.userparams.conf
165 -# Include=/usr/local/etc/zabbix_agent2.conf.d/
166 -# Include=/usr/local/etc/zabbix_agent2.conf.d/*.conf
167 +Include=/etc/zabbix/zabbix_agent2.conf.d/*.conf
169 ### Option:PluginTimeout
170 # Timeout for connections with external plugins.
172 # ForceActiveChecksOnStart=0
174 # Include configuration files for plugins
175 -Include=./zabbix_agent2.d/plugins.d/*.conf
176 +Include=/etc/zabbix/zabbix_agent2.d/plugins.d/*.conf
177 diff -ur zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.30/src/go/conf/zabbix_web_service.conf
178 --- zabbix-6.0.30.orig/src/go/conf/zabbix_web_service.conf 2024-05-21 08:57:51.000000000 +0200
179 +++ zabbix-6.0.30/src/go/conf/zabbix_web_service.conf 2024-06-13 13:24:12.415823801 +0200
182 # Mandatory: yes, if LogType is set to file, otherwise no
184 -# LogFile=/tmp/zabbix_web_service.log
185 +# LogFile=/var/log/zabbix/zabbix_web_service.log
187 ### Option: LogFileSize
188 # Maximum size of log file in MB.
189 diff -ur zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go zabbix-6.0.30/src/go/internal/agent/options_nix.go
190 --- zabbix-6.0.30.orig/src/go/internal/agent/options_nix.go 2024-05-21 08:57:56.000000000 +0200
191 +++ zabbix-6.0.30/src/go/internal/agent/options_nix.go 2024-06-13 13:24:12.415823801 +0200
194 type AgentOptions struct {
195 LogType string `conf:"optional,default=file"`
196 - LogFile string `conf:"optional,default=/tmp/zabbix_agent2.log"`
197 + LogFile string `conf:"optional,default=/var/log/zabbix/zabbix_agent2.log"`
198 LogFileSize int `conf:"optional,range=0:1024,default=1"`
199 DebugLevel int `conf:"optional,range=0:5,default=3"`
200 PidFile string `conf:"optional"`
201 diff -ur zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go
202 --- zabbix-6.0.30.orig/src/go/pkg/pidfile/pidfile_nix.go 2024-05-21 08:57:51.000000000 +0200
203 +++ zabbix-6.0.30/src/go/pkg/pidfile/pidfile_nix.go 2024-06-13 13:24:12.415823801 +0200
206 func createPidFile(pid int, path string) (file *os.File, err error) {
208 - path = "/tmp/zabbix_agent2.pid"
209 + path = "/var/run/zabbix/zabbix_agent2.pid"
212 flockT := syscall.Flock_t{
213 diff -ur zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c
214 --- zabbix-6.0.30.orig/src/zabbix_agent/zabbix_agentd.c 2024-05-21 08:57:56.000000000 +0200
215 +++ zabbix-6.0.30/src/zabbix_agent/zabbix_agentd.c 2024-06-13 13:24:12.415823801 +0200
217 CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
219 if (NULL == CONFIG_PID_FILE)
220 - CONFIG_PID_FILE = (char *)"/tmp/zabbix_agentd.pid";
221 + CONFIG_PID_FILE = (char *)"/var/run/zabbix/zabbix_agentd.pid";
223 if (NULL == CONFIG_LOG_TYPE_STR)
224 CONFIG_LOG_TYPE_STR = zbx_strdup(CONFIG_LOG_TYPE_STR, ZBX_OPTION_LOGTYPE_FILE);
225 diff -ur zabbix-6.0.30.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.30/src/zabbix_java/lib/logback.xml
226 --- zabbix-6.0.30.orig/src/zabbix_java/lib/logback.xml 2024-05-20 12:30:20.000000000 +0200
227 +++ zabbix-6.0.30/src/zabbix_java/lib/logback.xml 2024-06-13 13:24:12.415823801 +0200
230 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
232 - <file>/tmp/zabbix_java.log</file>
233 + <file>/var/log/zabbix/zabbix_java.log</file>
235 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
236 - <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
237 + <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
238 <minIndex>1</minIndex>
239 <maxIndex>3</maxIndex>
241 diff -ur zabbix-6.0.30.orig/src/zabbix_java/settings.sh zabbix-6.0.30/src/zabbix_java/settings.sh
242 --- zabbix-6.0.30.orig/src/zabbix_java/settings.sh 2024-05-20 12:30:20.000000000 +0200
243 +++ zabbix-6.0.30/src/zabbix_java/settings.sh 2024-06-13 13:24:12.415823801 +0200
248 -PID_FILE="/tmp/zabbix_java.pid"
249 +PID_FILE="/var/run/zabbix/zabbix_java.pid"
251 ### Option: zabbix.startPollers
252 # Number of worker threads to start.
253 diff -ur zabbix-6.0.30.orig/src/zabbix_proxy/proxy.c zabbix-6.0.30/src/zabbix_proxy/proxy.c
254 --- zabbix-6.0.30.orig/src/zabbix_proxy/proxy.c 2024-05-21 08:57:56.000000000 +0200
255 +++ zabbix-6.0.30/src/zabbix_proxy/proxy.c 2024-06-13 13:24:12.415823801 +0200
257 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
259 if (NULL == CONFIG_PID_FILE)
260 - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_proxy.pid");
261 + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_proxy.pid");
263 if (NULL == CONFIG_TMPDIR)
264 CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
265 diff -ur zabbix-6.0.30.orig/src/zabbix_server/server.c zabbix-6.0.30/src/zabbix_server/server.c
266 --- zabbix-6.0.30.orig/src/zabbix_server/server.c 2024-05-21 08:57:56.000000000 +0200
267 +++ zabbix-6.0.30/src/zabbix_server/server.c 2024-06-13 13:24:12.415823801 +0200
269 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
271 if (NULL == CONFIG_PID_FILE)
272 - CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/tmp/zabbix_server.pid");
273 + CONFIG_PID_FILE = zbx_strdup(CONFIG_PID_FILE, "/var/run/zabbix/zabbix_server.pid");
275 if (NULL == CONFIG_ALERT_SCRIPTS_PATH)
276 CONFIG_ALERT_SCRIPTS_PATH = zbx_strdup(CONFIG_ALERT_SCRIPTS_PATH, DEFAULT_ALERT_SCRIPTS_PATH);
277 diff -ur zabbix-6.0.30.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.30/ui/include/classes/core/CConfigFile.php
278 --- zabbix-6.0.30.orig/ui/include/classes/core/CConfigFile.php 2024-05-21 08:57:57.000000000 +0200
279 +++ zabbix-6.0.30/ui/include/classes/core/CConfigFile.php 2024-06-13 13:24:12.415823801 +0200
281 const CONFIG_ERROR = 2;
282 const CONFIG_VAULT_ERROR = 3;
284 - const CONFIG_FILE_PATH = '/conf/zabbix.conf.php';
285 + const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php';
287 private static $supported_db_types = [
288 ZBX_DB_MYSQL => true,
289 diff -ur zabbix-6.0.30.orig/ui/include/classes/core/ZBase.php zabbix-6.0.30/ui/include/classes/core/ZBase.php
290 --- zabbix-6.0.30.orig/ui/include/classes/core/ZBase.php 2024-05-21 08:57:57.000000000 +0200
291 +++ zabbix-6.0.30/ui/include/classes/core/ZBase.php 2024-06-13 13:24:12.419823858 +0200
295 protected function setMaintenanceMode() {
296 - require_once 'conf/maintenance.inc.php';
297 + require_once '/etc/zabbix/web/maintenance.inc.php';
299 if (defined('ZBX_DENY_GUI_ACCESS')) {
300 if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
302 * Load zabbix config file.
304 protected function loadConfigFile() {
305 - $configFile = $this->getRootDir().CConfigFile::CONFIG_FILE_PATH;
306 + $configFile = CConfigFile::CONFIG_FILE_PATH;
307 $config = new CConfigFile($configFile);
308 $this->config = $config->load();
310 diff -ur zabbix-6.0.30.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.30/ui/include/classes/setup/CSetupWizard.php
311 --- zabbix-6.0.30.orig/ui/include/classes/setup/CSetupWizard.php 2024-05-21 08:57:57.000000000 +0200
312 +++ zabbix-6.0.30/ui/include/classes/setup/CSetupWizard.php 2024-06-13 13:24:12.419823858 +0200
314 // make zabbix.conf.php downloadable
315 header('Content-Type: application/x-httpd-php');
316 header('Content-Disposition: attachment; filename="'.basename(CConfigFile::CONFIG_FILE_PATH).'"');
317 - $config = new CConfigFile(APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH);
318 + $config = new CConfigFile(CConfigFile::CONFIG_FILE_PATH);
321 'TYPE' => $this->getConfig('DB_TYPE'),
324 $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
326 - $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
327 + $config_file_name = CConfigFile::CONFIG_FILE_PATH;
328 $config = new CConfigFile($config_file_name);