packages: eximq/eximq.init, eximq/eximq.spec - use /var/run/eximq for pid f...

[arekm]

Author: arekm                        Date: Fri Oct 15 09:57:53 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use /var/run/eximq for pid files

---- Files affected:
packages/eximq:
   eximq.init (1.1 -> 1.2) , eximq.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/eximq/eximq.init
diff -u packages/eximq/eximq.init:1.1 packages/eximq/eximq.init:1.2
--- packages/eximq/eximq.init:1.1	Fri Oct 15 11:50:56 2010
+++ packages/eximq/eximq.init	Fri Oct 15 11:57:48 2010
@@ -34,7 +34,7 @@
 		grep -v -e '^[[:space:]]*$' -e '^#' $EXIMQ_CONFIG | while read args; do
 			n=$(printf '%02d' $(($n+1)))
 			msg_starting "eximq $n daemon"
-			daemon --user exim --makepid --pidfile /var/run/eximq.$n.pid --fork /usr/sbin/eximq.pl $args
+			daemon --user exim /usr/sbin/eximq.pl --pidfile /var/run/eximq/eximq.$n.pid --daemon $args
 			RETVAL=$?
 		done
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/eximq
@@ -49,7 +49,7 @@
 		grep -v -e '^[[:space:]]*$' -e '^#' $EXIMQ_CONFIG | while read args; do
 			n=$(printf '%02d' $(($n+1)))
 			msg_stopping "eximq $n daemon"
-			killproc --pidfile /var/run/eximq.$n.pid eximq.pl
+			killproc --pidfile /var/run/eximq/eximq.$n.pid eximq.pl
 		done
 		rm -f /var/lock/subsys/eximq >/dev/null 2>&1
 	else

================================================================
Index: packages/eximq/eximq.spec
diff -u packages/eximq/eximq.spec:1.1 packages/eximq/eximq.spec:1.2
--- packages/eximq/eximq.spec:1.1	Fri Oct 15 11:50:56 2010
+++ packages/eximq/eximq.spec	Fri Oct 15 11:57:48 2010
@@ -26,7 +26,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,mail},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,mail},%{_sbindir},/var/run/eximq}
 
 install %{SOURCE0} $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mail/eximq.args
@@ -50,6 +50,7 @@
 %attr(755,root,root) %{_sbindir}/eximq.pl
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mail/%{name}.args
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(755,exim,root) /var/run/eximq
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -57,6 +58,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2010/10/15 09:57:48  arekm
+- use /var/run/eximq for pid files
+
 Revision 1.1  2010/10/15 09:50:56  arekm
 - initial; exim queue supervisor
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eximq/eximq.init?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eximq/eximq.spec?r1=1.1&r2=1.2&f=u