]> git.pld-linux.org Git - packages/zabbix.git/blame - config.patch
projects / packages / zabbix.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
up to 6.0.15 (latest lts)
[packages/zabbix.git] / config.patch
CommitLineData
def50f77
ER		 1diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_agentd.conf zabbix-5.2.3/conf/zabbix_agentd.conf
2--- zabbix-5.2.3.org/conf/zabbix_agentd.conf 2020-12-21 10:47:57.000000000 +0100
3+++ zabbix-5.2.3/conf/zabbix_agentd.conf 2021-08-24 11:18:50.376675510 +0200
06317756
JK		 4@@ -9,6 +9,7 @@
5 # Mandatory: no
6 # Default:
7 # PidFile=/tmp/zabbix_agentd.pid
8d0f9b1e 8+PidFile=/var/run/zabbix/zabbix_agentd.pid
06317756
JK		 9
10 ### Option: LogType
11 # Specifies where log messages are written to:
12@@ -27,7 +28,7 @@
13 # Default:
14 # LogFile=
15
16-LogFile=/tmp/zabbix_agentd.log
17+LogFile=/var/log/zabbix/zabbix_agentd.log
18
19 ### Option: LogFileSize
20 # Maximum size of log file in MB.
def50f77 21@@ -304,7 +305,7 @@ Hostname=Zabbix server
3e3c35a0
JK		 22
23 # Include=/usr/local/etc/zabbix_agentd.userparams.conf
24 # Include=/usr/local/etc/zabbix_agentd.conf.d/
25-# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
26+Include=/etc/zabbix/zabbix_agentd.conf.d/*.conf
27
28 ####### USER-DEFINED MONITORED PARAMETERS #######
29
def50f77
ER		 30diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_proxy.conf zabbix-5.2.3/conf/zabbix_proxy.conf
31--- zabbix-5.2.3.org/conf/zabbix_proxy.conf 2020-12-21 10:47:57.000000000 +0100
32+++ zabbix-5.2.3/conf/zabbix_proxy.conf 2021-08-24 11:18:50.376675510 +0200
33@@ -88,7 +88,7 @@ Hostname=Zabbix proxy
06317756
JK		 34 # Default:
35 # LogFile=
36
37-LogFile=/tmp/zabbix_proxy.log
38+LogFile=/var/log/zabbix/zabbix_proxy.log
39
40 ### Option: LogFileSize
41 # Maximum size of log file in MB.
def50f77 42@@ -136,7 +136,7 @@ LogFile=/tmp/zabbix_proxy.log
06317756
JK		 43 #
44 # Mandatory: no
45 # Default:
46-# PidFile=/tmp/zabbix_proxy.pid
8d0f9b1e 47+PidFile=/var/run/zabbix/zabbix_proxy.pid
06317756 48
def50f77
ER		 49 ### Option: SocketDir
50 # IPC socket directory.
51@@ -586,7 +586,7 @@ LogSlowQueries=3000
3e3c35a0
JK		 52
53 # Include=/usr/local/etc/zabbix_proxy.general.conf
54 # Include=/usr/local/etc/zabbix_proxy.conf.d/
55-# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
56+Include=/etc/zabbix/zabbix_proxy.conf.d/*.conf
57
58 ### Option: SSLCertLocation
59 # Location of SSL client certificates.
def50f77
ER		 60diff -urNp -x '*.orig' zabbix-5.2.3.org/conf/zabbix_server.conf zabbix-5.2.3/conf/zabbix_server.conf
61--- zabbix-5.2.3.org/conf/zabbix_server.conf 2020-12-21 10:47:57.000000000 +0100
62+++ zabbix-5.2.3/conf/zabbix_server.conf 2021-08-24 11:18:50.376675510 +0200
06317756
JK		 63@@ -35,7 +35,7 @@
64 # Default:
65 # LogFile=
66
67-LogFile=/tmp/zabbix_server.log
68+LogFile=/var/log/zabbix/zabbix_server.log
69
70 ### Option: LogFileSize
71 # Maximum size of log file in MB.
def50f77 72@@ -65,7 +65,7 @@ LogFile=/tmp/zabbix_server.log
06317756
JK		 73 #
74 # Mandatory: no
75 # Default:
76-# PidFile=/tmp/zabbix_server.pid
8d0f9b1e 77+PidFile=/var/run/zabbix/zabbix_server.pid
06317756 78
def50f77
ER		 79 ### Option: SocketDir
80 # IPC socket directory.
81@@ -620,7 +620,7 @@ LogSlowQueries=3000
3e3c35a0
JK		 82
83 # Include=/usr/local/etc/zabbix_server.general.conf
84 # Include=/usr/local/etc/zabbix_server.conf.d/
85-# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
86+Include=/etc/zabbix/zabbix_server.conf.d/*.conf
87
88 ### Option: SSLCertLocation
89 # Location of SSL client certificates.
def50f77
ER		 90diff -urNp -x '*.orig' zabbix-5.2.3.org/src/zabbix_java/lib/logback.xml zabbix-5.2.3/src/zabbix_java/lib/logback.xml
91--- zabbix-5.2.3.org/src/zabbix_java/lib/logback.xml 2020-12-14 11:27:17.000000000 +0100
92+++ zabbix-5.2.3/src/zabbix_java/lib/logback.xml 2021-08-24 11:18:50.376675510 +0200
06317756
JK		 93@@ -2,10 +2,10 @@
94
95 <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
96
97- <file>/tmp/zabbix_java.log</file>
98+ <file>/var/log/zabbix/zabbix_java.log</file>
99
100 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
101- <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
102+ <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
103 <minIndex>1</minIndex>
104 <maxIndex>3</maxIndex>
105 </rollingPolicy>
def50f77
ER		 106diff -urNp -x '*.orig' zabbix-5.2.3.org/src/zabbix_java/settings.sh zabbix-5.2.3/src/zabbix_java/settings.sh
107--- zabbix-5.2.3.org/src/zabbix_java/settings.sh 2020-12-14 11:27:17.000000000 +0100
108+++ zabbix-5.2.3/src/zabbix_java/settings.sh 2021-08-24 11:18:50.376675510 +0200
06317756
JK		 109@@ -24,7 +24,7 @@
110 # Default:
111 # PID_FILE=
112
113-PID_FILE="/tmp/zabbix_java.pid"
8d0f9b1e 114+PID_FILE="/var/run/zabbix/zabbix_java.pid"
06317756
JK		 115
116 ### Option: zabbix.startPollers
117 # Number of worker threads to start.
def50f77
ER		 118diff -urNp -x '*.orig' zabbix-5.2.3.org/ui/include/classes/setup/CSetupWizard.php zabbix-5.2.3/ui/include/classes/setup/CSetupWizard.php
119--- zabbix-5.2.3.org/ui/include/classes/setup/CSetupWizard.php 2020-12-21 10:47:57.000000000 +0100
120+++ zabbix-5.2.3/ui/include/classes/setup/CSetupWizard.php 2021-08-24 11:18:50.376675510 +0200
121@@ -604,7 +604,7 @@ class CSetupWizard extends CForm {
122
123 $this->setConfig('ZBX_CONFIG_FILE_CORRECT', true);
124
125- $config_file_name = APP::getInstance()->getRootDir().CConfigFile::CONFIG_FILE_PATH;
126+ $config_file_name = '/etc/zabbix/frontend/zabbix.conf.php';
127 $config = new CConfigFile($config_file_name);
128 $config->config = [
129 'DB' => [
Zabbix - network monitoring software
This page took 0.255366 seconds and 4 git commands to generate.