gunnar: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.24, 1.25

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	freebusy.conf.template.in 
Log Message:
Prepare moving the template into the corresponding package (the dist_conf rewriting is not necessary anymore).

Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- freebusy.conf.template.in	22 Feb 2010 06:34:46 -0000	1.24
+++ freebusy.conf.template.in	16 May 2010 06:41:01 -0000	1.25
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@freebusy_confdir@/config.php
+TARGET=@@@freebusy_confdir@@@/config.php
 PERMISSIONS=0640
-OWNERSHIP=@freebusy_usr@:@freebusy_grp@
+OWNERSHIP=@@@freebusy_usr@@@:@@@freebusy_grp@@@
 KOLAB_META_END
 <?php
 @@@warning@@@
@@ -45,13 +45,13 @@
 /* Horde::Log configuration */
 $conf['log']['enabled']          = true;
 $conf['log']['priority']         = PEAR_LOG_DEBUG; // Leave this on DEBUG for now. We just restructured the package...
-$conf['log']['type']             = '@freebusy_log_type@';
-$conf['log']['name']             = '@freebusy_log_name@';
+$conf['log']['type']             = '@@@freebusy_log_type@@@';
+$conf['log']['name']             = '@@@freebusy_log_name@@@';
 $conf['log']['ident']            = 'Kolab Free/Busy';
 $conf['log']['params']['append'] = true;
 
 /* PHP error logging */
-ini_set('error_log', '@freebusy_logdir@/php-error.log');
+ini_set('error_log', '@@@freebusy_logdir@@@/php-error.log');
 
 /* Horde::Kolab::LDAP configuration */
 $conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
@@ -129,7 +129,7 @@
 $conf['fb']['email_domain'] = '@@@fqdnhostname@@@';
 
 /* Location of the cache files */
-$conf['fb']['cache_dir']    = '@freebusy_cachedir@';
+$conf['fb']['cache_dir']    = '@@@freebusy_cachedir@@@';
 
 /* What db type to use for the freebusy caches */
 $conf['fb']['dbformat']     = 'db4';
@@ -155,6 +155,20 @@
  * disabling the use of ACL settings.
  */
 $conf['fb']['use_acls'] = true;
+
+/* The resulting vCalendar file is being cached. The following setting
+ * determines how many seconds it will be delivered without checking if
+ * the contents of the file might have changed. A negative setting disables
+ * caching (which is currently required for the resource management to work).
+ */
+$conf['fb']['vcal_cache']['min_age'] = -1;
+
+/* The resulting vCalendar file is being cached. The following setting
+ * determines after how many seconds it will be considered too old for
+ * delivery and a refresh of its contents will be enforced.
+ */
+$conf['fb']['vcal_cache']['max_age'] = 259200;
+
 
 /* Are there remote servers on which users have additional (shared)
  * folders? In that case free/busy information should also be fetched