gunnar: server/kolabd/kolabd/templates httpd.conf.template.in, 1.17, 1.18 imapd.annotation_definitions.template.in, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	httpd.conf.template.in 
	imapd.annotation_definitions.template.in 
Log Message:
Support for the extended free/busy concept.

Index: httpd.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/httpd.conf.template.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- httpd.conf.template.in	21 Nov 2007 11:05:41 -0000	1.17
+++ httpd.conf.template.in	29 Nov 2007 15:32:11 -0000	1.18
@@ -145,20 +145,7 @@
   ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/admin/
 </Location>
 <Location "@webserver_web_prefix@/fbview">
-    Deny from all
     ErrorDocument 403 https://@@@fqdnhostname@@@@webserver_web_prefix@/fbview/
-</Location>
-<Location ~ "@webserver_web_prefix@/fbview/(index.php|login.php)?$">
-    Order allow,deny
-    Allow from all
-</Location>
-<Location ~ "@webserver_web_prefix@/fbview/services/(javascript.php|css.php)$">
-    Order allow,deny
-    Allow from all
-</Location>
-<Location ~ "@webserver_web_prefix@/fbview/(kronolith|themes)/">
-    Order allow,deny
-    Allow from all
 </Location>
 
 <Files ~ "^\.ht">

Index: imapd.annotation_definitions.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/imapd.annotation_definitions.template.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- imapd.annotation_definitions.template.in	3 Oct 2007 10:05:18 -0000	1.3
+++ imapd.annotation_definitions.template.in	29 Nov 2007 15:32:11 -0000	1.4
@@ -6,6 +6,7 @@
 /vendor/kolab/folder-test,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/folder-type,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/incidences-for,mailbox,string,backend,value.shared value.priv,a
+/vendor/kolab/xfb-readable,mailbox,string,backend,value.shared value.priv,a
 /vendor/kolab/h-share-attr-desc,mailbox,string,backend,value.shared value.priv,a
 /vendor/horde/share-params,mailbox,string,backend,value.shared value.priv,a
 /vendor/x-toltec/test,mailbox,string,backend,value.shared value.priv,a