gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.8, 1.9

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
Sync thes comments in this template with the file in kolab-resource-handlers.

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusy.conf.template.in	2 Mar 2007 04:40:21 -0000	1.8
+++ freebusy.conf.template.in	3 Aug 2007 10:33:27 -0000	1.9
@@ -8,7 +8,8 @@
 // Kolab prefix
 $params['kolab_prefix'] = '@prefix@';
 
-// The name of _this_ server
+// What is the address of the Cyrus server where the calendar data is stored?
+// This is also used as the LDAP server address where user objects reside
 $params['server'] = '@@@fqdnhostname@@@';
 
 // What is the address of the LDAP server address where user objects reside
@@ -17,8 +18,10 @@
 // What is the Base DN of our LDAP database?
 $params['base_dn'] = '@@@base_dn@@@';
 
-// DN and pw to use for LDAP access
+// What DN should we use to bind to the LDAP server?
 $params['bind_dn'] = '@@@php_dn@@@';
+
+// What password should we use with the above DN when binding?
 $params['bind_pw'] = '@@@php_pw@@@';
 
 // Are we using a multi-location setup? If this is true, we check the users'
@@ -102,3 +105,21 @@
 
 // don't change this if you don't have to
 //$params['ldap_classname_suffix'] = "_dummy";
+
+// Activate if you wish to use the new horde framework
+// (horde-framework-kolab) package instead of the old code in
+// kolab-horde-framework. This is still untested and considered
+// UNSAFE!
+$params['use_new_horde'] = false;
+
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+//
+// If you modify this file, please do not forget to modify both the
+// template and the source file in kolab-resource-handler.
+//
+// In order to check if both are in sync:
+//
+// cd server
+// diff -Nau kolab-resource-handlers/kolab-resource-handlers/freebusy/freebusy.conf kolabd/kolabd/templates/freebusy.conf.template.in
+//
+//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!