config.patch

   1 --- zabbix-3.2.0.orig/conf/zabbix_agentd.conf   2016-09-13 14:20:55.000000000 +0200
   2 +++ zabbix-3.2.0/conf/zabbix_agentd.conf        2016-10-01 18:42:28.000000000 +0200
   3 @@ -9,6 +9,7 @@
   4  # Mandatory: no
   5  # Default:
   6  # PidFile=/tmp/zabbix_agentd.pid
   7 +PidFile=/var/run/zabbix/zabbix_agentd.pid
   8
   9  ### Option: LogType
  10  #      Specifies where log messages are written to:
  11 @@ -27,7 +28,7 @@
  12  # Default:
  13  # LogFile=
  14
  15 -LogFile=/tmp/zabbix_agentd.log
  16 +LogFile=/var/log/zabbix/zabbix_agentd.log
  17
  18  ### Option: LogFileSize
  19  #      Maximum size of log file in MB.
  20 @@ -260,7 +261,7 @@
  21
  22  # Include=/usr/local/etc/zabbix_agentd.userparams.conf
  23  # Include=/usr/local/etc/zabbix_agentd.conf.d/
  24 -# Include=/usr/local/etc/zabbix_agentd.conf.d/*.conf
  25 +Include=/etc/zabbix/zabbix_agentd.conf.d/*.conf
  26
  27  ####### USER-DEFINED MONITORED PARAMETERS #######
  28
  29 --- zabbix-3.2.0.orig/conf/zabbix_proxy.conf    2016-09-13 14:20:55.000000000 +0200
  30 +++ zabbix-3.2.0/conf/zabbix_proxy.conf 2016-10-01 18:42:44.000000000 +0200
  31 @@ -82,7 +82,7 @@
  32  # Default:
  33  # LogFile=
  34
  35 -LogFile=/tmp/zabbix_proxy.log
  36 +LogFile=/var/log/zabbix/zabbix_proxy.log
  37
  38  ### Option: LogFileSize
  39  #      Maximum size of log file in MB.
  40 @@ -112,7 +112,7 @@
  41  #
  42  # Mandatory: no
  43  # Default:
  44 -# PidFile=/tmp/zabbix_proxy.pid
  45 +PidFile=/var/run/zabbix/zabbix_proxy.pid
  46
  47  ### Option: DBHost
  48  #      Database host name.
  49 @@ -543,7 +543,7 @@
  50
  51  # Include=/usr/local/etc/zabbix_proxy.general.conf
  52  # Include=/usr/local/etc/zabbix_proxy.conf.d/
  53 -# Include=/usr/local/etc/zabbix_proxy.conf.d/*.conf
  54 +Include=/etc/zabbix/zabbix_proxy.conf.d/*.conf
  55
  56  ### Option: SSLCertLocation
  57  #      Location of SSL client certificates.
  58 --- zabbix-3.2.0.orig/conf/zabbix_server.conf   2016-09-13 14:20:55.000000000 +0200
  59 +++ zabbix-3.2.0/conf/zabbix_server.conf        2016-10-01 18:43:07.000000000 +0200
  60 @@ -35,7 +35,7 @@
  61  # Default:
  62  # LogFile=
  63
  64 -LogFile=/tmp/zabbix_server.log
  65 +LogFile=/var/log/zabbix/zabbix_server.log
  66
  67  ### Option: LogFileSize
  68  #      Maximum size of log file in MB.
  69 @@ -65,7 +65,7 @@
  70  #
  71  # Mandatory: no
  72  # Default:
  73 -# PidFile=/tmp/zabbix_server.pid
  74 +PidFile=/var/run/zabbix/zabbix_server.pid
  75
  76  ### Option: DBHost
  77  #      Database host name.
  78 @@ -552,7 +552,7 @@
  79
  80  # Include=/usr/local/etc/zabbix_server.general.conf
  81  # Include=/usr/local/etc/zabbix_server.conf.d/
  82 -# Include=/usr/local/etc/zabbix_server.conf.d/*.conf
  83 +Include=/etc/zabbix/zabbix_server.conf.d/*.conf
  84
  85  ### Option: SSLCertLocation
  86  #      Location of SSL client certificates.
  87 --- zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php      2016-09-13 14:21:05.000000000 +0200
  88 +++ zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php   2016-10-01 18:42:06.000000000 +0200
  89 @@ -386,7 +386,7 @@
  90                                 new CTag('p', true, _('Alternatively, you can install it manually:')),
  91                                 new CTag('ol', true, [
  92                                         new CTag('li', true, new CLink(_('Download the configuration file'), 'setup.php?save_config=1')),
  93 -                                       new CTag('li', true, _s('Save it as "%1$s"', $config_file_name))
  94 +                                       new CTag('li', true, _s('Save it as "%1$s"', '/etc/zabbix/frontend/zabbix.conf.php'))
  95                                 ]),
  96                         ];
  97                 }
  98 --- zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml   2016-09-13 14:20:55.000000000 +0200
  99 +++ zabbix-3.2.0/src/zabbix_java/lib/logback.xml        2016-10-01 18:42:06.000000000 +0200
 100 @@ -2,10 +2,10 @@
 101
 102         <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 103
 104 -               <file>/tmp/zabbix_java.log</file>
 105 +               <file>/var/log/zabbix/zabbix_java.log</file>
 106
 107                 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
 108 -                       <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
 109 +                       <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
 110                         <minIndex>1</minIndex>
 111                         <maxIndex>3</maxIndex>
 112                 </rollingPolicy>
 113 --- zabbix-3.2.0.orig/src/zabbix_java/settings.sh       2016-09-13 14:20:55.000000000 +0200
 114 +++ zabbix-3.2.0/src/zabbix_java/settings.sh    2016-10-01 18:42:06.000000000 +0200
 115 @@ -24,7 +24,7 @@
 116  # Default:
 117  # PID_FILE=
 118
 119 -PID_FILE="/tmp/zabbix_java.pid"
 120 +PID_FILE="/var/run/zabbix/zabbix_java.pid"
 121
 122  ### Option: zabbix.startPollers
 123  #      Number of worker threads to start.