steffen: server/kolab/kolab/templates freebusy.conf.template, 1.8, 1.9 httpd.conf.template, 1.11, 1.12 resmgr.conf.template, 1.9, 1.10

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	freebusy.conf.template httpd.conf.template 
	resmgr.conf.template 
Log Message:
new freebusy stuff + versions

Index: freebusy.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/freebusy.conf.template,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- freebusy.conf.template	14 Sep 2004 20:33:19 -0000	1.8
+++ freebusy.conf.template	5 Oct 2004 10:08:51 -0000	1.9
@@ -74,3 +74,11 @@
 // Should we send a Content-Disposition header, indicating what the name of the
 // resulting VFB file should be?
 $params['send_content_disposition'] = false;
+
+// Where are we logging to?
+$params['log'] = 'file:@l_prefix@/var/resmgr/freebusy.log';                // File...
+// $params['log'] = 'syslog:cons, pid';            // Or syslog...
+
+// 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;

Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- httpd.conf.template	28 Sep 2004 13:12:48 -0000	1.11
+++ httpd.conf.template	5 Oct 2004 10:08:51 -0000	1.12
@@ -26,8 +26,10 @@
 RewriteRule ^/freebusy/([^/]+).ifb /freebusy/freebusy.php?uid=$1
 RewriteRule ^/freebusy/([^/]+).vfb /freebusy/freebusy.php?uid=$1
 RewriteRule ^/freebusy/([^/]+).xfb /freebusy/freebusy.php?x=1&uid=$1
-RewriteRule ^/freebusy/trigger/(.+).pfb /freebusy/pfb.php?folder=$1&cache=0
-RewriteRule ^/freebusy/(.+).pfb /freebusy/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/trigger/(.+)\.pfb /freebusy/pfb.php?folder=$1&cache=0
+RewriteRule ^/freebusy/(.+)\.pfb /freebusy/pfb.php?folder=$1&cache=1
+RewriteRule ^/freebusy/trigger/(.+)\.xpfb /freebusy/pfb.php?folder=$1&cache=0&extended=1
+RewriteRule ^/freebusy/(.+)\.xpfb /freebusy/pfb.php?folder=$1&cache=1&extended=1
 
 <VirtualHost _default_:443>
 SSLEngine               on

Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/resmgr.conf.template,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- resmgr.conf.template	29 Sep 2004 23:04:44 -0000	1.9
+++ resmgr.conf.template	5 Oct 2004 10:08:51 -0000	1.10
@@ -44,9 +44,11 @@
 
 // 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';
  
 // 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';
 
 // Where are we logging to?
 $params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log';                // File...