-diff -ur zabbix-7.0.12.orig/conf/zabbix_agentd.conf zabbix-7.0.12/conf/zabbix_agentd.conf
---- zabbix-7.0.12.orig/conf/zabbix_agentd.conf 2025-04-17 08:10:28.000000000 +0200
-+++ zabbix-7.0.12/conf/zabbix_agentd.conf 2025-04-22 20:41:46.254840486 +0200
+diff -ur zabbix-7.0.18.orig/conf/zabbix_agentd.conf zabbix-7.0.18/conf/zabbix_agentd.conf
+--- zabbix-7.0.18.orig/conf/zabbix_agentd.conf 2025-08-25 08:42:52.000000000 +0200
++++ zabbix-7.0.18/conf/zabbix_agentd.conf 2025-09-10 17:23:53.798521034 +0200
@@ -8,7 +8,7 @@
#
# Mandatory: no
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -319,15 +319,12 @@
+@@ -538,12 +538,9 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
-# 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-7.0.12.orig/conf/zabbix_proxy.conf zabbix-7.0.12/conf/zabbix_proxy.conf
---- zabbix-7.0.12.orig/conf/zabbix_proxy.conf 2025-04-22 11:06:26.000000000 +0200
-+++ zabbix-7.0.12/conf/zabbix_proxy.conf 2025-04-22 20:41:46.254840486 +0200
+diff -ur zabbix-7.0.18.orig/conf/zabbix_proxy.conf zabbix-7.0.18/conf/zabbix_proxy.conf
+--- zabbix-7.0.18.orig/conf/zabbix_proxy.conf 2025-08-25 08:42:52.000000000 +0200
++++ zabbix-7.0.18/conf/zabbix_proxy.conf 2025-09-10 17:23:53.798521034 +0200
@@ -81,7 +81,7 @@
# Default:
# LogFile=
### Option: SocketDir
# IPC socket directory.
-@@ -669,15 +669,12 @@
+@@ -1042,12 +1042,9 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
-# 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-7.0.12.orig/conf/zabbix_server.conf zabbix-7.0.12/conf/zabbix_server.conf
---- zabbix-7.0.12.orig/conf/zabbix_server.conf 2025-04-22 11:06:26.000000000 +0200
-+++ zabbix-7.0.12/conf/zabbix_server.conf 2025-04-22 20:41:46.254840486 +0200
+diff -ur zabbix-7.0.18.orig/conf/zabbix_server.conf zabbix-7.0.18/conf/zabbix_server.conf
+--- zabbix-7.0.18.orig/conf/zabbix_server.conf 2025-08-25 08:42:52.000000000 +0200
++++ zabbix-7.0.18/conf/zabbix_server.conf 2025-09-10 17:23:53.798521034 +0200
@@ -35,7 +35,7 @@
# Default:
# LogFile=
### Option: SocketDir
# IPC socket directory.
-@@ -701,15 +701,12 @@
+@@ -1116,12 +1116,9 @@
### Option: Include
# You may include individual files or all files in a directory in the configuration file.
-# 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-7.0.12.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.12/src/go/cmd/zabbix_web_service/config.go
---- zabbix-7.0.12.orig/src/go/cmd/zabbix_web_service/config.go 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/go/cmd/zabbix_web_service/config.go 2025-04-22 20:41:46.254840486 +0200
+diff -ur zabbix-7.0.18.orig/src/go/cmd/zabbix_web_service/config.go zabbix-7.0.18/src/go/cmd/zabbix_web_service/config.go
+--- zabbix-7.0.18.orig/src/go/cmd/zabbix_web_service/config.go 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/go/cmd/zabbix_web_service/config.go 2025-09-10 17:23:53.798521034 +0200
@@ -20,7 +20,7 @@
ListenPort string `conf:"optional,range=1024:32767,default=10053"`
AllowedIP string `conf:"optional"`
LogFileSize int `conf:"optional,range=0:1024,default=1"`
Timeout int `conf:"optional,range=1:30,default=10"`
DebugLevel int `conf:"range=0:5,default=3"`
-diff -ur zabbix-7.0.12.orig/src/go/conf/mock_server.conf zabbix-7.0.12/src/go/conf/mock_server.conf
---- zabbix-7.0.12.orig/src/go/conf/mock_server.conf 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/go/conf/mock_server.conf 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/go/conf/mock_server.conf zabbix-7.0.18/src/go/conf/mock_server.conf
+--- zabbix-7.0.18.orig/src/go/conf/mock_server.conf 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/go/conf/mock_server.conf 2025-09-10 17:23:53.798521034 +0200
@@ -18,7 +18,7 @@
# Default:
# LogFile=
### Option: DebugLevel
# Specifies debug level:
-diff -ur zabbix-7.0.12.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.12/src/go/conf/zabbix_agent2.conf
---- zabbix-7.0.12.orig/src/go/conf/zabbix_agent2.conf 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/go/conf/zabbix_agent2.conf 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/go/conf/zabbix_agent2.conf zabbix-7.0.18/src/go/conf/zabbix_agent2.conf
+--- zabbix-7.0.18.orig/src/go/conf/zabbix_agent2.conf 2025-08-25 08:42:53.000000000 +0200
++++ zabbix-7.0.18/src/go/conf/zabbix_agent2.conf 2025-09-10 17:23:53.798521034 +0200
@@ -8,7 +8,7 @@
#
# Mandatory: no
### Option: LogFileSize
# Maximum size of log file in MB.
-@@ -284,9 +284,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.
-@@ -489,7 +487,7 @@
+@@ -477,7 +477,7 @@
# ForceActiveChecksOnStart=0
# Include configuration files for plugins
####### For advanced users - TLS ciphersuite selection criteria #######
-diff -ur zabbix-7.0.12.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.12/src/go/conf/zabbix_web_service.conf
---- zabbix-7.0.12.orig/src/go/conf/zabbix_web_service.conf 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/go/conf/zabbix_web_service.conf 2025-04-22 20:41:46.258840498 +0200
+@@ -543,12 +543,9 @@
+
+ ### 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_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
+diff -ur zabbix-7.0.18.orig/src/go/conf/zabbix_web_service.conf zabbix-7.0.18/src/go/conf/zabbix_web_service.conf
+--- zabbix-7.0.18.orig/src/go/conf/zabbix_web_service.conf 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/go/conf/zabbix_web_service.conf 2025-09-10 17:23:53.798521034 +0200
@@ -18,7 +18,7 @@
#
# Mandatory: yes, if LogType is set to file, otherwise no
### Option: LogFileSize
# Maximum size of log file in MB.
-diff -ur zabbix-7.0.12.orig/src/go/internal/agent/options_nix.go zabbix-7.0.12/src/go/internal/agent/options_nix.go
---- zabbix-7.0.12.orig/src/go/internal/agent/options_nix.go 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/src/go/internal/agent/options_nix.go 2025-04-22 20:41:46.258840498 +0200
-@@ -19,7 +19,7 @@
+diff -ur zabbix-7.0.18.orig/src/go/internal/agent/options_nix.go zabbix-7.0.18/src/go/internal/agent/options_nix.go
+--- zabbix-7.0.18.orig/src/go/internal/agent/options_nix.go 2025-08-25 08:42:53.000000000 +0200
++++ zabbix-7.0.18/src/go/internal/agent/options_nix.go 2025-09-10 17:23:53.798521034 +0200
+@@ -18,7 +18,7 @@
type AgentOptions struct {
LogType string `conf:"optional,default=file"`
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-7.0.12.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.12/src/go/pkg/pidfile/pidfile_nix.go
---- zabbix-7.0.12.orig/src/go/pkg/pidfile/pidfile_nix.go 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/go/pkg/pidfile/pidfile_nix.go 2025-04-22 20:41:46.258840498 +0200
-@@ -26,7 +26,7 @@
+diff -ur zabbix-7.0.18.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-7.0.18/src/go/pkg/pidfile/pidfile_nix.go
+--- zabbix-7.0.18.orig/src/go/pkg/pidfile/pidfile_nix.go 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/go/pkg/pidfile/pidfile_nix.go 2025-09-10 17:23:53.798521034 +0200
+@@ -25,7 +25,7 @@
func createPidFile(pid int, path string) (file *os.File, err error) {
if path == "" {
}
flockT := syscall.Flock_t{
-diff -ur zabbix-7.0.12.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.12/src/zabbix_agent/zabbix_agentd.c
---- zabbix-7.0.12.orig/src/zabbix_agent/zabbix_agentd.c 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/src/zabbix_agent/zabbix_agentd.c 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/zabbix_agent/zabbix_agentd.c zabbix-7.0.18/src/zabbix_agent/zabbix_agentd.c
+--- zabbix-7.0.18.orig/src/zabbix_agent/zabbix_agentd.c 2025-08-25 08:42:53.000000000 +0200
++++ zabbix-7.0.18/src/zabbix_agent/zabbix_agentd.c 2025-09-10 17:23:53.802521046 +0200
@@ -695,7 +695,7 @@
config_load_module_path = zbx_strdup(config_load_module_path, DEFAULT_LOAD_MODULE_PATH);
#endif
if (NULL == log_file_cfg.log_type_str)
log_file_cfg.log_type_str = zbx_strdup(log_file_cfg.log_type_str, ZBX_OPTION_LOGTYPE_FILE);
-diff -ur zabbix-7.0.12.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.12/src/zabbix_java/lib/logback.xml
---- zabbix-7.0.12.orig/src/zabbix_java/lib/logback.xml 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/zabbix_java/lib/logback.xml 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/zabbix_java/lib/logback.xml zabbix-7.0.18/src/zabbix_java/lib/logback.xml
+--- zabbix-7.0.18.orig/src/zabbix_java/lib/logback.xml 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/zabbix_java/lib/logback.xml 2025-09-10 17:23:53.802521046 +0200
@@ -2,10 +2,10 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<minIndex>1</minIndex>
<maxIndex>3</maxIndex>
</rollingPolicy>
-diff -ur zabbix-7.0.12.orig/src/zabbix_java/settings.sh zabbix-7.0.12/src/zabbix_java/settings.sh
---- zabbix-7.0.12.orig/src/zabbix_java/settings.sh 2025-04-17 08:10:29.000000000 +0200
-+++ zabbix-7.0.12/src/zabbix_java/settings.sh 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/zabbix_java/settings.sh zabbix-7.0.18/src/zabbix_java/settings.sh
+--- zabbix-7.0.18.orig/src/zabbix_java/settings.sh 2025-08-25 08:42:21.000000000 +0200
++++ zabbix-7.0.18/src/zabbix_java/settings.sh 2025-09-10 17:23:53.802521046 +0200
@@ -24,7 +24,7 @@
# Default:
# PID_FILE=
### Option: zabbix.startPollers
# Number of worker threads to start.
-diff -ur zabbix-7.0.12.orig/src/zabbix_proxy/proxy.c zabbix-7.0.12/src/zabbix_proxy/proxy.c
---- zabbix-7.0.12.orig/src/zabbix_proxy/proxy.c 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/src/zabbix_proxy/proxy.c 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/zabbix_proxy/proxy.c zabbix-7.0.18/src/zabbix_proxy/proxy.c
+--- zabbix-7.0.18.orig/src/zabbix_proxy/proxy.c 2025-08-25 08:42:53.000000000 +0200
++++ zabbix-7.0.18/src/zabbix_proxy/proxy.c 2025-09-10 17:23:53.802521046 +0200
@@ -544,7 +544,7 @@
zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
if (NULL == zbx_config_tmpdir)
zbx_config_tmpdir = zbx_strdup(zbx_config_tmpdir, "/tmp");
-diff -ur zabbix-7.0.12.orig/src/zabbix_server/server.c zabbix-7.0.12/src/zabbix_server/server.c
---- zabbix-7.0.12.orig/src/zabbix_server/server.c 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/src/zabbix_server/server.c 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/src/zabbix_server/server.c zabbix-7.0.18/src/zabbix_server/server.c
+--- zabbix-7.0.18.orig/src/zabbix_server/server.c 2025-08-25 08:42:53.000000000 +0200
++++ zabbix-7.0.18/src/zabbix_server/server.c 2025-09-10 17:23:53.802521046 +0200
@@ -644,7 +644,7 @@
zbx_config_snmptrap_file = zbx_strdup(zbx_config_snmptrap_file, "/tmp/zabbix_traps.tmp");
if (NULL == zbx_config_alert_scripts_path)
zbx_config_alert_scripts_path = zbx_strdup(zbx_config_alert_scripts_path, DEFAULT_ALERT_SCRIPTS_PATH);
-diff -ur zabbix-7.0.12.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.12/ui/include/classes/core/CConfigFile.php
---- zabbix-7.0.12.orig/ui/include/classes/core/CConfigFile.php 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/ui/include/classes/core/CConfigFile.php 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/ui/include/classes/core/CConfigFile.php zabbix-7.0.18/ui/include/classes/core/CConfigFile.php
+--- zabbix-7.0.18.orig/ui/include/classes/core/CConfigFile.php 2025-08-25 08:42:54.000000000 +0200
++++ zabbix-7.0.18/ui/include/classes/core/CConfigFile.php 2025-09-10 17:23:53.802521046 +0200
@@ -20,7 +20,7 @@
const CONFIG_ERROR = 2;
const CONFIG_VAULT_ERROR = 3;
private static $supported_db_types = [
ZBX_DB_MYSQL => true,
-diff -ur zabbix-7.0.12.orig/ui/include/classes/core/ZBase.php zabbix-7.0.12/ui/include/classes/core/ZBase.php
---- zabbix-7.0.12.orig/ui/include/classes/core/ZBase.php 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/ui/include/classes/core/ZBase.php 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/ui/include/classes/core/ZBase.php zabbix-7.0.18/ui/include/classes/core/ZBase.php
+--- zabbix-7.0.18.orig/ui/include/classes/core/ZBase.php 2025-08-25 08:42:54.000000000 +0200
++++ zabbix-7.0.18/ui/include/classes/core/ZBase.php 2025-09-10 17:23:53.802521046 +0200
@@ -392,7 +392,7 @@
* @throws Exception
*/
$config = new CConfigFile($configFile);
-diff -ur zabbix-7.0.12.orig/ui/include/classes/setup/CSetupWizard.php zabbix-7.0.12/ui/include/classes/setup/CSetupWizard.php
---- zabbix-7.0.12.orig/ui/include/classes/setup/CSetupWizard.php 2025-04-22 11:06:27.000000000 +0200
-+++ zabbix-7.0.12/ui/include/classes/setup/CSetupWizard.php 2025-04-22 20:41:46.258840498 +0200
+diff -ur zabbix-7.0.18.orig/ui/include/classes/setup/CSetupWizard.php zabbix-7.0.18/ui/include/classes/setup/CSetupWizard.php
+--- zabbix-7.0.18.orig/ui/include/classes/setup/CSetupWizard.php 2025-08-25 08:42:54.000000000 +0200
++++ zabbix-7.0.18/ui/include/classes/setup/CSetupWizard.php 2025-09-10 17:23:53.802521046 +0200
@@ -117,7 +117,7 @@
}
}
$table = (new CFormList())
->addItem([
-@@ -1048,7 +1048,7 @@
+@@ -1050,7 +1050,7 @@
$this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);