gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.18, 1.19 resmgr.conf.template.in, 1.31, 1.32

cvs at kolab.org cvs at kolab.org
Fri Nov 14 10:22:28 CET 2008


Author: gunnar

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

Modified Files:
	freebusy.conf.template.in resmgr.conf.template.in 
Log Message:
Ensure we use the correct group driver within Kolab_FreeBusy and update the reference points for the templates (note by Richard Bos).

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- freebusy.conf.template.in	13 Nov 2008 05:43:35 -0000	1.18
+++ freebusy.conf.template.in	14 Nov 2008 09:22:26 -0000	1.19
@@ -129,15 +129,18 @@
  */
 $conf['fb']['remote_servers'] = array();
 
+/**
+ * Ensure we use the Kolab group driver when handling groups.
+ */
+$conf['group']['driver'] = 'kolab';
+$conf['group']['cache'] = false;
+
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
-// If you modify this file, please do not forget to modify both the
-// template in kolabd and the source file in kolab-freebusy
-//
-// In order to check if both are in sync:
-//
-// cd server
-// diff -Nau kolab-freebusy/freebusy/config.php kolabd/kolabd/templates/freebusy.conf.template.in
+// If you modify this file, please do not forget to ping upstream
+// about synchronizing this file with 
+// 
+// http://cvs.horde.org/framework/Kolab_FreeBusy/www/Horde/Kolab/FreeBusy/config.php
 //
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- resmgr.conf.template.in	13 Nov 2008 06:44:09 -0000	1.31
+++ resmgr.conf.template.in	14 Nov 2008 09:22:26 -0000	1.32
@@ -186,13 +186,10 @@
 
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 //
-// If you modify this file, please do not forget to modify both the
-// template in kolabd and the source file in kolab-freebusy
-//
-// In order to check if both are in sync:
+// If you modify this file, please do not forget to ping upstream
+// about synchronizing this file with 
 //
-// cd server
-// diff -Nau kolab-filter/filter/config.php kolabd/kolabd/templates/resmgr.conf.template.in
+// FIXME: The upstream reference point is currently missing!
 //
 //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ?>





More information about the commits mailing list