config.patch

   1 diff -dur zabbix-3.2.0.orig/conf/zabbix_agentd.conf zabbix-3.2.0/conf/zabbix_agentd.conf
   2 --- zabbix-3.2.0.orig/conf/zabbix_agentd.conf   2016-09-13 14:20:55.000000000 +0200
   3 +++ zabbix-3.2.0/conf/zabbix_agentd.conf        2016-09-29 14:05:11.000000000 +0200
   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.
  21 diff -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_proxy.conf
  22 --- zabbix-3.2.0.orig/conf/zabbix_proxy.conf    2016-09-13 14:20:55.000000000 +0200
  23 +++ zabbix-3.2.0/conf/zabbix_proxy.conf 2016-09-29 14:05:11.000000000 +0200
  24 @@ -82,7 +82,7 @@
  25  # Default:
  26  # LogFile=
  27
  28 -LogFile=/tmp/zabbix_proxy.log
  29 +LogFile=/var/log/zabbix/zabbix_proxy.log
  30
  31  ### Option: LogFileSize
  32  #      Maximum size of log file in MB.
  33 @@ -112,7 +112,7 @@
  34  #
  35  # Mandatory: no
  36  # Default:
  37 -# PidFile=/tmp/zabbix_proxy.pid
  38 +PidFile=/run/zabbix/zabbix_proxy.pid
  39
  40  ### Option: DBHost
  41  #      Database host name.
  42 diff -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_server.conf
  43 --- zabbix-3.2.0.orig/conf/zabbix_server.conf   2016-09-13 14:20:55.000000000 +0200
  44 +++ zabbix-3.2.0/conf/zabbix_server.conf        2016-09-29 14:05:11.000000000 +0200
  45 @@ -35,7 +35,7 @@
  46  # Default:
  47  # LogFile=
  48
  49 -LogFile=/tmp/zabbix_server.log
  50 +LogFile=/var/log/zabbix/zabbix_server.log
  51
  52  ### Option: LogFileSize
  53  #      Maximum size of log file in MB.
  54 @@ -65,7 +65,7 @@
  55  #
  56  # Mandatory: no
  57  # Default:
  58 -# PidFile=/tmp/zabbix_server.pid
  59 +PidFile=/run/zabbix/zabbix_server.pid
  60
  61  ### Option: DBHost
  62  #      Database host name.
  63 diff -dur zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml zabbix-3.2.0/src/zabbix_java/lib/logback.xml
  64 --- zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml   2016-09-13 14:20:55.000000000 +0200
  65 +++ zabbix-3.2.0/src/zabbix_java/lib/logback.xml        2016-09-29 14:07:41.000000000 +0200
  66 @@ -2,10 +2,10 @@
  67
  68         <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
  69
  70 -               <file>/tmp/zabbix_java.log</file>
  71 +               <file>/var/log/zabbix/zabbix_java.log</file>
  72
  73                 <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
  74 -                       <fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
  75 +                       <fileNamePattern>/var/log/zabbix/zabbix_java.log.%i</fileNamePattern>
  76                         <minIndex>1</minIndex>
  77                         <maxIndex>3</maxIndex>
  78                 </rollingPolicy>
  79 diff -dur zabbix-3.2.0.orig/src/zabbix_java/settings.sh zabbix-3.2.0/src/zabbix_java/settings.sh
  80 --- zabbix-3.2.0.orig/src/zabbix_java/settings.sh       2016-09-13 14:20:55.000000000 +0200
  81 +++ zabbix-3.2.0/src/zabbix_java/settings.sh    2016-09-29 14:05:32.000000000 +0200
  82 @@ -24,7 +24,7 @@
  83  # Default:
  84  # PID_FILE=
  85
  86 -PID_FILE="/tmp/zabbix_java.pid"
  87 +PID_FILE="/run/zabbix/zabbix_java.pid"
  88
  89  ### Option: zabbix.startPollers
  90  #      Number of worker threads to start.
  91 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
  92 --- zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.php      2016-09-13 14:21:05.000000000 +0200
  93 +++ zabbix-3.2.0/frontends/php/include/classes/setup/CSetupWizard.php   2016-09-29 12:43:27.000000000 +0200
  94 @@ -386,7 +386,7 @@
  95                                 new CTag('p', true, _('Alternatively, you can install it manually:')),
  96                                 new CTag('ol', true, [
  97                                         new CTag('li', true, new CLink(_('Download the configuration file'), 'setup.php?save_config=1')),
  98 -                                       new CTag('li', true, _s('Save it as "%1$s"', $config_file_name))
  99 +                                       new CTag('li', true, _s('Save it as "%1$s"', '/etc/zabbix/frontend/zabbix.conf.php'))
 100                                 ]),
 101                         ];
 102                 }
 103 Only in zabbix-3.2.0/frontends/php/include/classes/setup: CSetupWizard.php~