tld.patch

   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-11 00:18:54.065715198 +0100
   4 @@ -8,7 +8,7 @@
   5  #
   6  # Mandatory: no
   7  # Default:
   8 -# PidFile=/tmp/zabbix_agentd.pid
   9 +# PidFile=/var/run/zabbix/zabbix_agentd.pid
  10
  11  ### Option: LogType
  12  #      Specifies where log messages are written to:
  13 @@ -27,7 +27,7 @@
  14  # Default:
  15  # LogFile=
  16
  17 -LogFile=/tmp/zabbix_agentd.log
  18 +LogFile=/var/log/zabbix/zabbix_agentd.log
  19
  20  ### Option: LogFileSize
  21  #      Maximum size of log file in MB.
  22 @@ -309,15 +309,12 @@
  23
  24  ### Option: Include
  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.
  27  #
  28  # Mandatory: no
  29  # Default:
  30  # Include=
  31
  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
  36
  37  ####### USER-DEFINED MONITORED PARAMETERS #######
  38
  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-11 00:18:54.065715198 +0100
  42 @@ -81,7 +81,7 @@
  43  # Default:
  44  # LogFile=
  45
  46 -LogFile=/tmp/zabbix_proxy.log
  47 +LogFile=/var/log/zabbix/zabbix_proxy.log
  48
  49  ### Option: LogFileSize
  50  #      Maximum size of log file in MB.
  51 @@ -129,7 +129,7 @@
  52  #
  53  # Mandatory: no
  54  # Default:
  55 -# PidFile=/tmp/zabbix_proxy.pid
  56 +# PidFile=/var/run/zabbix/zabbix_proxy.pid
  57
  58  ### Option: SocketDir
  59  #      IPC socket directory.
  60 @@ -605,15 +605,12 @@
  61
  62  ### Option: Include
  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.
  65  #
  66  # Mandatory: no
  67  # Default:
  68  # Include=
  69
  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
  74
  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-11 00:18:54.065715198 +0100
  80 @@ -35,7 +35,7 @@
  81  # Default:
  82  # LogFile=
  83
  84 -LogFile=/tmp/zabbix_server.log
  85 +LogFile=/var/log/zabbix/zabbix_server.log
  86
  87  ### Option: LogFileSize
  88  #      Maximum size of log file in MB.
  89 @@ -65,7 +65,7 @@
  90  #
  91  # Mandatory: no
  92  # Default:
  93 -# PidFile=/tmp/zabbix_server.pid
  94 +# PidFile=/var/run/zabbix/zabbix_server.pid
  95
  96  ### Option: SocketDir
  97  #      IPC socket directory.
  98 @@ -654,15 +654,12 @@
  99
 100  ### Option: Include
 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.
 103  #
 104  # Mandatory: no
 105  # Default:
 106  # Include=
 107
 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
 112
 113  ### Option: SSLCertLocation
 114  #      Location of SSL client certificates.
 115 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
 116 --- zabbix-6.0.25.orig/src/go/cmd/zabbix_web_service/config.go  2023-12-13 09:17:16.000000000 +0100
 117 +++ zabbix-6.0.25/src/go/cmd/zabbix_web_service/config.go       2024-01-11 00:28:57.120343885 +0100
 118 @@ -25,7 +25,7 @@
 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.25.orig/src/go/conf/mock_server.conf zabbix-6.0.25/src/go/conf/mock_server.conf
 128 --- zabbix-6.0.25.orig/src/go/conf/mock_server.conf     2023-12-13 09:17:29.000000000 +0100
 129 +++ zabbix-6.0.25/src/go/conf/mock_server.conf  2024-01-11 00:29:17.508601798 +0100
 130 @@ -18,7 +18,7 @@
 131  # Default:
 132  # LogFile=
 133
 134 -#LogFile=/tmp/zabbix_mock_server.log
 135 +#LogFile=/var/log/zabbix/zabbix_mock_server.log
 136
 137  ### Option: DebugLevel
 138  #      Specifies debug level:
 139 diff -ur zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf zabbix-6.0.25/src/go/conf/zabbix_agent2.conf
 140 --- zabbix-6.0.25.orig/src/go/conf/zabbix_agent2.conf   2023-12-13 09:17:33.000000000 +0100
 141 +++ zabbix-6.0.25/src/go/conf/zabbix_agent2.conf        2024-01-11 00:27:56.657579028 +0100
 142 @@ -8,7 +8,7 @@
 143  #
 144  # Mandatory: no
 145  # Default:
 146 -# PidFile=/tmp/zabbix_agent2.pid
 147 +# PidFile=/var/run/zabbix/zabbix_agent2.pid
 148
 149  ### Option: LogType
 150  #      Specifies where log messages are written to:
 151 @@ -25,7 +25,7 @@
 152  #
 153  # Mandatory: yes, if LogType is set to file, otherwise no
 154  # Default:
 155 -# LogFile=/tmp/zabbix_agent2.log
 156 +# LogFile=/var/log/zabbix/zabbix_agent2.log
 157
 158  ### Option: LogFileSize
 159  #      Maximum size of log file in MB.
 160 @@ -272,9 +272,7 @@
 161  # Default:
 162  # Include=
 163
 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
 168
 169  ### Option:PluginTimeout
 170  #      Timeout for connections with external plugins.
 171 @@ -477,4 +475,4 @@
 172  # ForceActiveChecksOnStart=0
 173
 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.25.orig/src/go/conf/zabbix_web_service.conf zabbix-6.0.25/src/go/conf/zabbix_web_service.conf
 178 --- zabbix-6.0.25.orig/src/go/conf/zabbix_web_service.conf      2023-12-13 09:17:29.000000000 +0100
 179 +++ zabbix-6.0.25/src/go/conf/zabbix_web_service.conf   2024-01-11 00:29:05.116445036 +0100
 180 @@ -18,7 +18,7 @@
 181  #
 182  # Mandatory: yes, if LogType is set to file, otherwise no
 183  # Default:
 184 -# LogFile=/tmp/zabbix_web_service.log
 185 +# LogFile=/var/log/zabbix/zabbix_web_service.log
 186
 187  ### Option: LogFileSize
 188  #      Maximum size of log file in MB.
 189 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
 190 --- zabbix-6.0.25.orig/src/go/internal/agent/options_nix.go     2023-12-13 09:17:33.000000000 +0100
 191 +++ zabbix-6.0.25/src/go/internal/agent/options_nix.go  2024-01-11 00:31:22.998189252 +0100
 192 @@ -24,7 +24,7 @@
 193
 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.25.orig/src/go/pkg/pidfile/pidfile_nix.go zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go
 202 --- zabbix-6.0.25.orig/src/go/pkg/pidfile/pidfile_nix.go        2023-12-13 09:17:16.000000000 +0100
 203 +++ zabbix-6.0.25/src/go/pkg/pidfile/pidfile_nix.go     2024-01-11 00:28:30.003000848 +0100
 204 @@ -31,7 +31,7 @@
 205
 206  func createPidFile(pid int, path string) (file *os.File, err error) {
 207         if path == "" {
 208 -               path = "/tmp/zabbix_agent2.pid"
 209 +               path = "/var/run/zabbix/zabbix_agent2.pid"
 210         }
 211
 212         flockT := syscall.Flock_t{
 213 diff -ur zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c
 214 --- zabbix-6.0.25.orig/src/zabbix_agent/zabbix_agentd.c 2023-12-13 09:17:33.000000000 +0100
 215 +++ zabbix-6.0.25/src/zabbix_agent/zabbix_agentd.c      2024-01-11 00:18:54.066715211 +0100
 216 @@ -603,7 +603,7 @@
 217                 CONFIG_LOAD_MODULE_PATH = zbx_strdup(CONFIG_LOAD_MODULE_PATH, DEFAULT_LOAD_MODULE_PATH);
 218
 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";
 222  #endif
 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.25.orig/src/zabbix_java/lib/logback.xml zabbix-6.0.25/src/zabbix_java/lib/logback.xml
 226 --- zabbix-6.0.25.orig/src/zabbix_java/lib/logback.xml  2023-12-13 09:17:17.000000000 +0100
 227 +++ zabbix-6.0.25/src/zabbix_java/lib/logback.xml       2024-01-11 00:18:54.066715211 +0100
 228 @@ -2,10 +2,10 @@
 229
 230         <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 231
 232 -               <file>/tmp/zabbix_java.log</file>
 233 +               <file>/var/log/zabbix/zabbix_java.log</file>
 234
 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>
 240                 </rollingPolicy>
 241 diff -ur zabbix-6.0.25.orig/src/zabbix_java/settings.sh zabbix-6.0.25/src/zabbix_java/settings.sh
 242 --- zabbix-6.0.25.orig/src/zabbix_java/settings.sh      2023-12-13 09:17:17.000000000 +0100
 243 +++ zabbix-6.0.25/src/zabbix_java/settings.sh   2024-01-11 00:18:54.066715211 +0100
 244 @@ -24,7 +24,7 @@
 245  # Default:
 246  # PID_FILE=
 247
 248 -PID_FILE="/tmp/zabbix_java.pid"
 249 +PID_FILE="/var/run/zabbix/zabbix_java.pid"
 250
 251  ### Option: zabbix.startPollers
 252  #      Number of worker threads to start.
 253 diff -ur zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c zabbix-6.0.25/src/zabbix_proxy/proxy.c
 254 --- zabbix-6.0.25.orig/src/zabbix_proxy/proxy.c 2023-12-13 09:17:33.000000000 +0100
 255 +++ zabbix-6.0.25/src/zabbix_proxy/proxy.c      2024-01-11 00:18:54.067715224 +0100
 256 @@ -515,7 +515,7 @@
 257                 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
 258
 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");
 262
 263         if (NULL == CONFIG_TMPDIR)
 264                 CONFIG_TMPDIR = zbx_strdup(CONFIG_TMPDIR, "/tmp");
 265 diff -ur zabbix-6.0.25.orig/src/zabbix_server/server.c zabbix-6.0.25/src/zabbix_server/server.c
 266 --- zabbix-6.0.25.orig/src/zabbix_server/server.c       2023-12-13 09:17:33.000000000 +0100
 267 +++ zabbix-6.0.25/src/zabbix_server/server.c    2024-01-11 00:18:54.067715224 +0100
 268 @@ -578,7 +578,7 @@
 269                 CONFIG_SNMPTRAP_FILE = zbx_strdup(CONFIG_SNMPTRAP_FILE, "/tmp/zabbix_traps.tmp");
 270
 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");
 274
 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.25.orig/ui/include/classes/core/CConfigFile.php zabbix-6.0.25/ui/include/classes/core/CConfigFile.php
 278 --- zabbix-6.0.25.orig/ui/include/classes/core/CConfigFile.php  2023-12-13 09:17:33.000000000 +0100
 279 +++ zabbix-6.0.25/ui/include/classes/core/CConfigFile.php       2024-01-11 00:18:54.067715224 +0100
 280 @@ -25,7 +25,7 @@
 281         const CONFIG_ERROR = 2;
 282         const CONFIG_VAULT_ERROR = 3;
 283
 284 -       const CONFIG_FILE_PATH = '/conf/zabbix.conf.php';
 285 +       const CONFIG_FILE_PATH = '/etc/zabbix/web/zabbix.conf.php';
 286
 287         private static $supported_db_types = [
 288                 ZBX_DB_MYSQL => true,
 289 diff -ur zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php zabbix-6.0.25/ui/include/classes/core/ZBase.php
 290 --- zabbix-6.0.25.orig/ui/include/classes/core/ZBase.php        2023-12-13 09:17:33.000000000 +0100
 291 +++ zabbix-6.0.25/ui/include/classes/core/ZBase.php     2024-01-11 00:18:54.139716136 +0100
 292 @@ -380,7 +380,7 @@
 293          * @throws Exception
 294          */
 295         protected function setMaintenanceMode() {
 296 -               require_once 'conf/maintenance.inc.php';
 297 +               require_once '/etc/zabbix/web/maintenance.inc.php';
 298
 299                 if (defined('ZBX_DENY_GUI_ACCESS')) {
 300                         if (!isset($ZBX_GUI_ACCESS_IP_RANGE) || !in_array(CWebUser::getIp(), $ZBX_GUI_ACCESS_IP_RANGE)) {
 301 @@ -393,7 +393,7 @@
 302          * Load zabbix config file.
 303          */
 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();
 309         }
 310 diff -ur zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php
 311 --- zabbix-6.0.25.orig/ui/include/classes/setup/CSetupWizard.php        2023-12-13 09:17:33.000000000 +0100
 312 +++ zabbix-6.0.25/ui/include/classes/setup/CSetupWizard.php     2024-01-11 00:18:54.139716136 +0100
 313 @@ -271,7 +271,7 @@
 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);
 319                                 $config->config = [
 320                                         'DB' => [
 321                                                 'TYPE' => $this->getConfig('DB_TYPE'),
 322 @@ -821,7 +821,7 @@
 323
 324                 $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
 325
 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);
 329                 $config->config = [
 330                         'DB' => [