steffen: server/kolab/kolab/templates kolab.conf.template, 1.5, 1.6 resmgr.conf.template, 1.10, 1.11

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	kolab.conf.template resmgr.conf.template 
Log Message:
new internal calendar user

Index: kolab.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/kolab.conf.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolab.conf.template	6 Sep 2004 14:00:36 -0000	1.5
+++ kolab.conf.template	7 Oct 2004 10:13:08 -0000	1.6
@@ -11,3 +11,5 @@
 ldap_master_uri : @@@ldap_master_uri@@@
 php_dn : cn=nobody,cn=internal,@@@kolab_basedn@@@
 php_pw : @@@nobody_pw@@@
+calendar_dn : cn=calendar,cn=internal,@@@kolab_basedn@@@
+calendar_pw : @@@calendar_pw@@@

Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/resmgr.conf.template,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- resmgr.conf.template	5 Oct 2004 10:08:51 -0000	1.10
+++ resmgr.conf.template	7 Oct 2004 10:13:08 -0000	1.11
@@ -33,8 +33,8 @@
 
 // What account should we use to read/write calendar data? This account should
 // have access to the calendar mailbox of all resource/group mailboxes.
-//$params['calendar_user'] = '@@@cyrus-admins@@@';
-//$params['calendar_pass'] = '@@@bind_pw@@@';
+$params['calendar_user'] = 'calendar@'.$params['email_domain'];
+$params['calendar_pass'] = '@@@calendar_pw@@@';
 
 // Filename of private key used to decrypt password from LDAP
 $params['priv_key_file'] = '@l_prefix@/etc/kolab/res_priv.pem';
@@ -73,4 +73,4 @@
 //   RM_ACT_MANUAL                        always handle manually
 //
 // This is overridden by a "-m" command line switch
-$params['action'] = RM_ACT_REJECT_IF_CONFLICTS;
+$params['action'] = RM_ACT_MANUAL;