gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 webclient-kolab-conf.template, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6
In directory doto:/tmp/cvs-serv17664/kolab-webclient/horde/templates/horde-3.3.6

Modified Files:
	webclient-kolab-conf.template 
Log Message:
Merge patches from the kolab_2_2 branch.

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-kolab-conf.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- webclient-kolab-conf.template	12 Jan 2010 22:16:53 -0000	1.2
+++ webclient-kolab-conf.template	22 Jan 2010 19:59:49 -0000	1.3
@@ -23,9 +23,17 @@
 @@@endif@@@
 $conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
 
-/*
+/**
  * Kolab uses file based preferences by default. There is an alternative
  * IMAP based driver that allows the users to keep their preferences in
  * the IMAP storage. You can activate it here.
  */
 //$conf['prefs']['driver'] = 'kolab_imap';
+
+/**
+ * Credentials for a proxy user to allow quasi anonymous ICS access
+ * via kronolith/ics_kolab.php
+ */
+//$conf['ics']['default_user'] = '';
+//$conf['ics']['default_pass'] = '';
+