steffen: server/kolab/kolab/templates resmgr.conf.template, 1.11, 1.12

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv15018/kolab/kolab/templates

Modified Files:
	resmgr.conf.template 
Log Message:
Converted resmgr to use Net_IMAP and made it use the folder-type annotation to discover the primary calendar folder

Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/resmgr.conf.template,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- resmgr.conf.template	7 Oct 2004 10:13:08 -0000	1.11
+++ resmgr.conf.template	29 Oct 2004 00:20:20 -0000	1.12
@@ -40,15 +40,15 @@
 $params['priv_key_file'] = '@l_prefix@/etc/kolab/res_priv.pem';
 
 // What is the name of the users' calendar mailbox?
+// This is only used when the user does not already have
+// a primary calendar folder (search via Kolab annotation)
 $params['calendar_store'] = 'Calendar';
 
 // Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://@@@fqdnhostname@@@/freebusy/${USER}.ifb';
-$params['ext_freebusy_url'] = 'http://@@@fqdnhostname@@@/freebusy/${USER}.xfb';
+$params['freebusy_url'] = 'http://@@@fqdnhostname@@@/freebusy/${USER}.xfb';
  
 // PFB url to trigger creation of pfb
-$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/Calendar.pfb';
-$params['xpfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/Calendar.xpfb';
+$params['pfb_trigger_url'] = 'http://@@@fqdnhostname@@@/freebusy/trigger/${USER}/${FOLDER}.xpfb';
 
 // Where are we logging to?
 $params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log';                // File...
@@ -57,20 +57,4 @@
 // What level of output should we log? Higher levels give more verbose output.
 // One of: RM_LOG_SILENT; RM_LOG_ERROR; RM_LOG_WARN; RM_LOG_INFO or RM_LOG_DEBUG.
 $params['log_level'] = RM_LOG_DEBUG;
-
-// Is this script being used for groups? If this is false, the script acts as
-// a plain resource handler.
-// NO LONGER USED: This is now specified through a "-g" command line switch
-// $params['group'] = true;
-
-// What default action should be taken when an event occurs? Can be one of:
-//   RM_ACT_ALWAYS_ACCEPT                 always accept the request
-//   RM_ACT_ALWAYS_REJECT                 always rejects the request
-//   RM_ACT_REJECT_IF_CONFLICTS           reject if there is a conflict
-//
-// The following are only for groups:
-//   RM_ACT_MANUAL_IF_CONFLICTS           handle manually if it conflicts
-//   RM_ACT_MANUAL                        always handle manually
-//
-// This is overridden by a "-m" command line switch
-$params['action'] = RM_ACT_MANUAL;
+?>
\ No newline at end of file