From 8d0f9b1e9fe25e320302f814016b55c40714faaf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 11 Apr 2018 14:57:08 +0300 Subject: [PATCH] use /var/run for pids (systemd and sysv compatible path) --- config.patch | 14 ++++---------- zabbix.spec | 6 +++--- zabbix.tmpfiles | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/config.patch b/config.patch index 4f781f0..ad2db4f 100644 --- a/config.patch +++ b/config.patch @@ -1,11 +1,10 @@ -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 ++PidFile=/var/run/zabbix/zabbix_agentd.pid ### Option: LogType # Specifies where log messages are written to: @@ -27,7 +26,6 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_agentd.conf zabbix-3.2.0/conf/zabbix_age ####### 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 @@ @@ -44,7 +42,7 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_prox # Mandatory: no # Default: -# PidFile=/tmp/zabbix_proxy.pid -+PidFile=/run/zabbix/zabbix_proxy.pid ++PidFile=/var/run/zabbix/zabbix_proxy.pid ### Option: DBHost # Database host name. @@ -57,7 +55,6 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_proxy.conf zabbix-3.2.0/conf/zabbix_prox ### 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 @@ @@ -74,7 +71,7 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_ser # Mandatory: no # Default: -# PidFile=/tmp/zabbix_server.pid -+PidFile=/run/zabbix/zabbix_server.pid ++PidFile=/var/run/zabbix/zabbix_server.pid ### Option: DBHost # Database host name. @@ -87,7 +84,6 @@ diff -dur zabbix-3.2.0.orig/conf/zabbix_server.conf zabbix-3.2.0/conf/zabbix_ser ### 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 @@ @@ -99,7 +95,6 @@ diff -dur zabbix-3.2.0.orig/frontends/php/include/classes/setup/CSetupWizard.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 @@ @@ -115,7 +110,6 @@ diff -dur zabbix-3.2.0.orig/src/zabbix_java/lib/logback.xml zabbix-3.2.0/src/zab 1 3 -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 @@ @@ -123,7 +117,7 @@ diff -dur zabbix-3.2.0.orig/src/zabbix_java/settings.sh zabbix-3.2.0/src/zabbix_ # PID_FILE= -PID_FILE="/tmp/zabbix_java.pid" -+PID_FILE="/run/zabbix/zabbix_java.pid" ++PID_FILE="/var/run/zabbix/zabbix_java.pid" ### Option: zabbix.startPollers # Number of worker threads to start. diff --git a/zabbix.spec b/zabbix.spec index 44c7cd9..45b16b5 100644 --- a/zabbix.spec +++ b/zabbix.spec @@ -15,7 +15,7 @@ Summary: Zabbix - network monitoring software Summary(pl.UTF-8): Zabbix - oprogramowanie do monitorowania sieci Name: zabbix Version: 3.4.5 -Release: 2 +Release: 3 License: GPL v2+ Group: Networking/Utilities Source0: http://downloads.sourceforge.net/zabbix/%{name}-%{version}.tar.gz @@ -372,7 +372,7 @@ done %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/rc.d/init.d,/etc/webapps/%{_webapp},%{_appdir}} \ - $RPM_BUILD_ROOT{/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}} + $RPM_BUILD_ROOT{/var/run/zabbix,/var/log/zabbix,%{systemdunitdir},%{systemdtmpfilesdir}} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -558,7 +558,7 @@ ln -sf %{_sbindir}/zabbix_proxy-sqlite3 %{_sbindir}/zabbix_proxy || : %attr(751,root,http) %dir %{_sysconfdir}/frontend %dir %{_appdir} %dir %{_appdir}/frontends -%dir %attr(770,root,zabbix) /run/zabbix +%dir %attr(770,root,zabbix) /var/run/zabbix %dir %attr(775,root,zabbix) /var/log/zabbix %{systemdtmpfilesdir}/zabbix.conf diff --git a/zabbix.tmpfiles b/zabbix.tmpfiles index bb46de8..c99c037 100644 --- a/zabbix.tmpfiles +++ b/zabbix.tmpfiles @@ -1 +1 @@ -d /run/zabbix 0770 root zabbix - +d /var/run/zabbix 0770 root zabbix - -- 2.44.0