From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 27 Jan 2016 22:32:53 +0000 (+0200)
Subject: use pid file location writable to daemon
X-Git-Tag: auto/th/gearmand-1.1.12-1~2
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=4b3195b4bc17e8b23e6d45beffb8a094d853b6c0;p=packages%2Fgearmand.git

use pid file location writable to daemon
---

diff --git a/gearmand.init b/gearmand.init
index 56142be..3cd1935 100755
--- a/gearmand.init
+++ b/gearmand.init
@@ -32,7 +32,7 @@ OPTIONS=""
 # Get service config - may override defaults
 [ -f /etc/sysconfig/gearmand ] && . /etc/sysconfig/gearmand
 
-pidfile="/var/run/gearmand.pid"
+pidfile="/var/run/gearmand/gearmand.pid"
 lockfile="/var/lock/subsys/gearmand"
 gearmand="/usr/sbin/gearmand"
 procname="gearmand"
@@ -45,7 +45,7 @@ start() {
 	fi
 
 	msg_starting "Gearmand job server"
-	daemon --pidfile $pidfile --user gearmand $gearmand -d $OPTIONS
+	daemon --pidfile $pidfile --user gearmand $gearmand -d --pid-file=$pidfile $OPTIONS
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch $lockfile
 }
diff --git a/gearmand.spec b/gearmand.spec
index 8265d32..99b535f 100644
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -23,7 +23,7 @@
 Summary:	A distributed job system
 Name:		gearmand
 Version:	1.1.12
-Release:	0.1
+Release:	0.2
 License:	BSD
 Group:		Daemons
 Source0:	https://launchpad.net/gearmand/1.2/%{version}/+download/%{name}-%{version}.tar.gz
@@ -184,7 +184,7 @@ fi
 %{_mandir}/man1/gearman.1*
 %{_mandir}/man8/gearmand.8*
 %{systemdunitdir}/%{name}.service
-%dir %attr(755,gearmand,gearmand) /var/run/gearmand
+%dir %attr(771,root,gearmand) /var/run/gearmand
 %attr(640,gearmand,gearmand) %config(noreplace) %verify(not md5 mtime size) /var/log/gearmand.log
 
 %files -n libgearman