provide the .conf.d directories in /etc/zabbix

diff --git a/config.patch b/config.patch
index af5550c31278d6d591c5ef422b5f2b2d03d4b865..4f781f083beaacb3882c04e8403e610fb745f2cc 100644 (file)
--- a/config.patch
+++ b/config.patch
@@ -1,6 +1,6 @@
 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-09-29 14:05:11.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:
@@ -18,9 +18,18 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_agentd.conf zabbix-3.2.0/conf/zabbix_age
  
  ### 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-09-29 14:05:11.000000000 +0200
++++ zabbix-3.2.0/conf/zabbix_proxy.conf        2016-10-01 18:42:44.000000000 +0200
 @@ -82,7 +82,7 @@
  # Default:
  # LogFile=
@@ -39,9 +48,18 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_prox
  
  ### 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-09-29 14:05:11.000000000 +0200
++++ zabbix-3.2.0/conf/zabbix_server.conf       2016-10-01 18:43:07.000000000 +0200
 @@ -35,7 +35,7 @@
  # Default:
  # LogFile=
@@ -60,9 +78,30 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_ser
  
  ### 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-09-29 14:07:41.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">
@@ -78,7 +117,7 @@ diff -dur zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml zabbix-3.2.0/src/zab
                </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-09-29 14:05:32.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=
@@ -88,16 +127,3 @@ diff -dur zabbix-3.2.0.orig/src/zabbix_java/settings.sh zabbix-3.2.0/src/zabbix_
  
  ### Option: zabbix.startPollers
  #     Number of worker threads to start.
-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-09-29 12:43:27.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'))
-                               ]),
-                       ];
-               }
-Only in zabbix-3.2.0/frontends/php/include/classes/setup: CSetupWizard.php~

diff --git a/zabbix.spec b/zabbix.spec
index ca734ef792c01ed4442647cd2f68d1b4e0790cd7..3b22e133fd9cf3705637e5a2dbe1fed54e08beaf 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -553,7 +553,9 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 
 %files agentd
 %defattr(644,root,root,755)
+%doc conf/zabbix_agentd/*.conf
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_agentd.conf
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_agentd.conf.d
 %attr(755,root,root) %{_sbindir}/zabbix_agentd
 %{_mandir}/man8/zabbix_agentd*
 %{systemdunitdir}/zabbix_agentd.service
@@ -576,6 +578,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %files proxy
 %defattr(644,root,root,755)
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_proxy.conf
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_proxy.conf.d
 %ghost %attr(755,root,root) %{_sbindir}/zabbix_proxy
 %{_mandir}/man8/zabbix_proxy*
 %{systemdunitdir}/zabbix_proxy.service
@@ -607,6 +610,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || :
 %defattr(644,root,root,755)
 %doc upgrades/dbpatches
 %attr(640,root,zabbix) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/zabbix_server.conf
+%dir %attr(751,root,zabbix) %{_sysconfdir}/zabbix_server.conf.d
 %ghost %attr(755,root,root) %{_sbindir}/zabbix_server
 %{_mandir}/man8/zabbix_server*
 %{systemdunitdir}/zabbix_server.service