[packages/zabbix.git] / config.patch

diff -dur zabbix-3.2.0.orig/conf/zabbix_agentd.conf zabbix-3.2.0/conf/zabbix_agentd.conf
--- zabbix-3.2.0.orig/conf/zabbix_agentd.conf	2016-09-13 14:20:55.000000000 +0200
+++ zabbix-3.2.0/conf/zabbix_agentd.conf	2016-10-01 18:42:28.000000000 +0200
@@ -9,6 +9,7 @@
 # Mandatory: no
 # Default:
 # PidFile=/tmp/zabbix_agentd.pid
+PidFile=/run/zabbix/zabbix_agentd.pid
 
 ### Option: LogType
 #	Specifies where log messages are written to:
@@ -27,7 +28,7 @@
 # Default:
 # LogFile=
 
-LogFile=/tmp/zabbix_agentd.log
+LogFile=/var/log/zabbix/zabbix_agentd.log
 
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
@@ -260,7 +261,7 @@
 
 # Include=/usr/local/etc/zabbix_agentd.userparams.conf
 # 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 -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_proxy.conf
--- zabbix-3.2.0.orig/conf/zabbix_proxy.conf	2016-09-13 14:20:55.000000000 +0200
+++ zabbix-3.2.0/conf/zabbix_proxy.conf	2016-10-01 18:42:44.000000000 +0200
@@ -82,7 +82,7 @@
 # Default:
 # LogFile=
 
-LogFile=/tmp/zabbix_proxy.log
+LogFile=/var/log/zabbix/zabbix_proxy.log
 
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
@@ -112,7 +112,7 @@
 #
 # Mandatory: no
 # Default:
-# PidFile=/tmp/zabbix_proxy.pid
+PidFile=/run/zabbix/zabbix_proxy.pid
 
 ### Option: DBHost
 #	Database host name.
@@ -543,7 +543,7 @@
 
 # Include=/usr/local/etc/zabbix_proxy.general.conf
 # 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 -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_server.conf
--- zabbix-3.2.0.orig/conf/zabbix_server.conf	2016-09-13 14:20:55.000000000 +0200
+++ zabbix-3.2.0/conf/zabbix_server.conf	2016-10-01 18:43:07.000000000 +0200
@@ -35,7 +35,7 @@
 # Default:
 # LogFile=
 
-LogFile=/tmp/zabbix_server.log
+LogFile=/var/log/zabbix/zabbix_server.log
 
 ### Option: LogFileSize
 #	Maximum size of log file in MB.
@@ -65,7 +65,7 @@
 #
 # Mandatory: no
 # Default:
-# PidFile=/tmp/zabbix_server.pid
+PidFile=/run/zabbix/zabbix_server.pid
 
 ### Option: DBHost
 #	Database host name.
@@ -552,7 +552,7 @@
 
 # Include=/usr/local/etc/zabbix_server.general.conf
 # 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 -dur zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php
--- zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php	2016-09-13 14:21:05.000000000 +0200
+++ zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php	2016-10-01 18:42:06.000000000 +0200
@@ -386,7 +386,7 @@
 				new CTag('p', true, _('Alternatively, you can install it manually:')),
 				new CTag('ol', true, [
 					new CTag('li', true, new CLink(_('Download the configuration file'), 'setup.php?save_config=1')),
-					new CTag('li', true, _s('Save it as "%1$s"', $config_file_name))
+					new CTag('li', true, _s('Save it as "%1$s"', '/etc/zabbix/frontend/zabbix.conf.php'))
 				]),
 			];
 		}
diff -dur zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml zabbix-3.2.0/src/zabbix_java/lib/logback.xml
--- zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml	2016-09-13 14:20:55.000000000 +0200
+++ zabbix-3.2.0/src/zabbix_java/lib/logback.xml	2016-10-01 18:42:06.000000000 +0200
@@ -2,10 +2,10 @@
 
 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-		<file>/tmp/zabbix_java.log</file>
+		<file>/var/log/zabbix/zabbix_java.log</file>
 
 		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
+			<fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
 			<minIndex>1</minIndex>
 			<maxIndex>3</maxIndex>
 		</rollingPolicy>
diff -dur zabbix-3.2.0.orig/src/zabbix_java/settings.sh zabbix-3.2.0/src/zabbix_java/settings.sh
--- zabbix-3.2.0.orig/src/zabbix_java/settings.sh	2016-09-13 14:20:55.000000000 +0200
+++ zabbix-3.2.0/src/zabbix_java/settings.sh	2016-10-01 18:42:06.000000000 +0200
@@ -24,7 +24,7 @@
 # Default:
 # PID_FILE=
 
-PID_FILE="/tmp/zabbix_java.pid"
+PID_FILE="/run/zabbix/zabbix_java.pid"
 
 ### Option: zabbix.startPollers
 #	Number of worker threads to start.
Commit	Line	Data
06317756 JK	1	diff -dur zabbix-3.2.0.orig/conf/zabbix_agentd.conf zabbix-3.2.0/conf/zabbix_agentd.conf
06317756 JK	2	--- zabbix-3.2.0.orig/conf/zabbix_agentd.conf 2016-09-13 14:20:55.000000000 +0200
3e3c35a0	3	+++ zabbix-3.2.0/conf/zabbix_agentd.conf 2016-10-01 18:42:28.000000000 +0200
06317756 JK	4	@@ -9,6 +9,7 @@
	5	# Mandatory: no
	6	# Default:
	7	# PidFile=/tmp/zabbix_agentd.pid
	8	+PidFile=/run/zabbix/zabbix_agentd.pid
	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.
3e3c35a0 JK	21	@@ -260,7 +261,7 @@
	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
06317756 JK	30	diff -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_proxy.conf
06317756 JK	31	--- zabbix-3.2.0.orig/conf/zabbix_proxy.conf 2016-09-13 14:20:55.000000000 +0200
3e3c35a0	32	+++ zabbix-3.2.0/conf/zabbix_proxy.conf 2016-10-01 18:42:44.000000000 +0200
06317756 JK	33	@@ -82,7 +82,7 @@
	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.
	42	@@ -112,7 +112,7 @@
	43	#
	44	# Mandatory: no
	45	# Default:
	46	-# PidFile=/tmp/zabbix_proxy.pid
	47	+PidFile=/run/zabbix/zabbix_proxy.pid
	48
	49	### Option: DBHost
	50	# Database host name.
3e3c35a0 JK	51	@@ -543,7 +543,7 @@
	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.
06317756 JK	60	diff -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_server.conf
06317756 JK	61	--- zabbix-3.2.0.orig/conf/zabbix_server.conf 2016-09-13 14:20:55.000000000 +0200
3e3c35a0	62	+++ zabbix-3.2.0/conf/zabbix_server.conf 2016-10-01 18:43:07.000000000 +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.
	72	@@ -65,7 +65,7 @@
	73	#
	74	# Mandatory: no
	75	# Default:
	76	-# PidFile=/tmp/zabbix_server.pid
	77	+PidFile=/run/zabbix/zabbix_server.pid
	78
	79	### Option: DBHost
	80	# Database host name.
3e3c35a0 JK	81	@@ -552,7 +552,7 @@
	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.
	90	diff -dur zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php
	91	--- zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php 2016-09-13 14:21:05.000000000 +0200
	92	+++ zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php 2016-10-01 18:42:06.000000000 +0200
	93	@@ -386,7 +386,7 @@
	94	new CTag('p', true, _('Alternatively, you can install it manually:')),
	95	new CTag('ol', true, [
	96	new CTag('li', true, new CLink(_('Download the configuration file'), 'setup.php?save_config=1')),
	97	- new CTag('li', true, _s('Save it as "%1$s"', $config_file_name))
	98	+ new CTag('li', true, _s('Save it as "%1$s"', '/etc/zabbix/frontend/zabbix.conf.php'))
	99	]),
	100	];
	101	}
06317756 JK	102	diff -dur zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml zabbix-3.2.0/src/zabbix_java/lib/logback.xml
06317756 JK	103	--- zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml 2016-09-13 14:20:55.000000000 +0200
3e3c35a0	104	+++ zabbix-3.2.0/src/zabbix_java/lib/logback.xml 2016-10-01 18:42:06.000000000 +0200
06317756 JK	105	@@ -2,10 +2,10 @@
	106
	107	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
	108
	109	- <file>/tmp/zabbix_java.log</file>
	110	+ <file>/var/log/zabbix/zabbix_java.log</file>
	111
	112	<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
	113	- <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
	114	+ <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
	115	<minIndex>1</minIndex>
	116	<maxIndex>3</maxIndex>
	117	</rollingPolicy>
	118	diff -dur zabbix-3.2.0.orig/src/zabbix_java/settings.sh zabbix-3.2.0/src/zabbix_java/settings.sh
	119	--- zabbix-3.2.0.orig/src/zabbix_java/settings.sh 2016-09-13 14:20:55.000000000 +0200
3e3c35a0	120	+++ zabbix-3.2.0/src/zabbix_java/settings.sh 2016-10-01 18:42:06.000000000 +0200
06317756 JK	121	@@ -24,7 +24,7 @@
	122	# Default:
	123	# PID_FILE=
	124
	125	-PID_FILE="/tmp/zabbix_java.pid"
	126	+PID_FILE="/run/zabbix/zabbix_java.pid"
	127
	128	### Option: zabbix.startPollers
	129	# Number of worker threads to start.