thomas: server/kolabd/kolabd ChangeLog, 1.206, 1.207 kolabd.spec.in, 1.38, 1.39 rc.kolabd.in, 1.4, 1.5

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv30813/kolabd/kolabd

Modified Files:
	ChangeLog kolabd.spec.in rc.kolabd.in 
Log Message:
kolabd.spec.in, rc.kolabd.in: Use OpenPKG mechanism to execute
kolabquotawarn, fixes kolab/issue936 (kolabquotawarn: system cron
used, and firing when server stopped)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- ChangeLog	21 Nov 2008 11:36:45 -0000	1.206
+++ ChangeLog	21 Nov 2008 13:12:36 -0000	1.207
@@ -1,7 +1,9 @@
 2008-11-21  Thomas Arendsen Hein  <thomas at intevation.de>
 
-	* kolabd.spec.in: Adjust crontab entry for new location of
-	kolabquotawarn and only try to execute it if it is executable.
+	* kolabd.spec.in: Adjust crontab entry for new location.
+	* kolabd.spec.in, rc.kolabd.in: Use OpenPKG mechanism to execute
+	kolabquotawarn, fixes kolab/issue936 (kolabquotawarn: system cron
+	used, and firing when server stopped)
 
 2008-11-18  Mathieu Parent <math.parent at gmail.com>
 

Index: kolabd.spec.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolabd.spec.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolabd.spec.in	21 Nov 2008 11:36:45 -0000	1.38
+++ kolabd.spec.in	21 Nov 2008 13:12:36 -0000	1.39
@@ -129,8 +129,7 @@
 	# NOTE: OpenPKG's dcron package does not work currently, 
 	# so we have to rely on the host system's cron:
     %{l_shtool} echo -e "`crontab -u %{l_musr} -l | grep -v '%{l_prefix}/[a-z/]*/kolabquotawarn'`" \
-	'
-*/10 * * * * test -x %{l_prefix}/bin/kolabquotawarn && %{l_prefix}/bin/kolabquotawarn' | crontab - -u %{l_musr}
+	| crontab - -u %{l_musr}
 
     echo "For a fresh install please initialize Kolab by running '$RPM_INSTALL_PREFIX/sbin/kolab_bootstrap -b' as user root."
     echo "If you upgraded from a previous version simply refresh Kolab by running run '$RPM_INSTALL_PREFIX/sbin/kolabconf' as user root."

Index: rc.kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/rc.kolabd.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rc.kolabd.in	21 Nov 2008 11:49:19 -0000	1.4
+++ rc.kolabd.in	21 Nov 2008 13:12:36 -0000	1.5
@@ -95,3 +95,8 @@
         -P "${kolabd_log_fbview_prolog}" \
         -E "${kolabd_log_fbview_epilog}" \
         "${kolabd_log_fbview_logfile}"
+
+%quarterly -u @kolab_musr@
+    rcService kolabd enable yes || exit 0
+    rcService kolabd active no  && exit 0
+    @bindir@/kolabquotawarn