use pid file location writable to daemon

diff --git a/gearmand.init b/gearmand.init
index 56142bebd9cc4d840885ea5c83e6bc23094964c9..3cd1935c4ad955823932b83c14550e0ec87af991 100755 (executable)
--- 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 8265d326236b2278077cf6ef4c952505c1a2c925..99b535f4e92b59bbec8294e9c1318bedba343006 100644 (file)
--- 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