steffen: server/kolab/kolab/templates master.cf.template, 1.6, 1.7 resmgr.conf.template, 1.3, 1.4
cvs at intevation.de
cvs at intevation.de
Tue Jul 13 03:22:16 CEST 2004
Author: steffen
Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv16088/kolab/templates
Modified Files:
master.cf.template resmgr.conf.template
Log Message:
password support for resources/groups
Index: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/master.cf.template,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- master.cf.template 18 Jun 2004 01:25:59 -0000 1.6
+++ master.cf.template 13 Jul 2004 01:22:13 -0000 1.7
@@ -62,4 +62,4 @@
-m RM_ACT_MANUAL_IF_CONFLICTS
kolabres unix - n n - 1 pipe user=kolab-n flags= argv=/kolab/etc/resmgr/resmgr.php
-r ${recipient}
- -m RM_ACT_MANUAL_IF_CONFLICTS
+ -m RM_ACT_REJECT_IF_CONFLICTS
Index: resmgr.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/resmgr.conf.template,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resmgr.conf.template 7 Jul 2004 16:57:59 -0000 1.3
+++ resmgr.conf.template 13 Jul 2004 01:22:13 -0000 1.4
@@ -15,18 +15,32 @@
// Should we append domains to mailbox URIs? This only applies when
// virtual_domains is true, and when using manager accounts.
-$params['append_domains'] = true;
+$params['append_domains'] = false;
+
+// LDAP data
+// What is the address of the LDAP server address where user objects reside
+$params['ldap_uri'] = '@@@ldap_uri@@@';
+
+// What is the Base DN of our LDAP database?
+$params['base_dn'] = '@@@base_dn@@@';
+
+// What DN should we use to bind to the LDAP server?
+$params['bind_dn'] = '@@@php_dn@@@';
+
+// What password should we use with the above DN when binding?
+$params['bind_pw'] = '@@@php_pw@@@';
+
// 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'] = '@@@cyrus-admins@@@';
+//$params['calendar_pass'] = '@@@bind_pw@@@';
// What is the name of the users' calendar mailbox?
$params['calendar_store'] = 'Calendar';
// Where can we get free/busy information from?
-$params['freebusy_url'] = 'http://localhost/freebusy/${USER}.ifb';
+$params['freebusy_url'] = 'http://@@@fqhostname@@@/freebusy/${USER}.ifb';
// Where are we logging to?
$params['log'] = 'file:@l_prefix@/var/resmgr/resmgr.log'; // File...
More information about the commits
mailing list