steffen: server/kolabd/kolabd/templates main.cf.template.in, 1.4, 1.5 resmgr.conf.template.in, 1.1, 1.2

[cvs at intevation.de]

Author: steffen

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

Modified Files:
	main.cf.template.in resmgr.conf.template.in 
Log Message:
Grrr! ldap maps did not survive the autoconfiscation

Index: main.cf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- main.cf.template.in	11 Oct 2005 12:34:32 -0000	1.4
+++ main.cf.template.in	13 Oct 2005 23:56:51 -0000	1.5
@@ -63,9 +63,11 @@
 
 #   maps
 canonical_maps = hash:@emailserver_confdir@/canonical
-virtual_maps =  hash:@emailserver_confdir@/virtual, ldap:ldapdistlist, ldap:ldapvirtual
+virtual_maps =  hash:@emailserver_confdir@/virtual, 
+	ldap:@emailserver_confdir@/ldapdistlist.cf, 
+	ldap:@emailserver_confdir@/ldapvirtual.cf
 relocated_maps = hash:@emailserver_confdir@/relocated
-transport_maps = hash:@emailserver_confdir@/transport, ldap:ldaptransport
+transport_maps = hash:@emailserver_confdir@/transport, ldap:@emailserver_confdir@/ldaptransport.cf
 alias_maps = hash:@emailserver_confdir@/aliases
 alias_database = hash:@emailserver_confdir@/aliases
 #virtual_mailbox_maps = $virtual_maps
@@ -144,62 +146,6 @@
 
 # Support broken clients like Microsoft Outlook Express 4.x which expect AUTH=LOGIN instead of AUTH LOGIN
 broken_sasl_auth_clients = yes
-
-#
-# LDAP Alias support
-#
-
-ldapvirtual_server_host = @@@ldap_uri@@@
-ldapvirtual_search_base = @@@user_dn_list@@@
-ldapvirtual_query_filter = (&(!(kolabDeleteFlag=*))(|(alias=%s)(mail=%s)))
-ldapvirtual_result_attribute = mail
-ldapvirtual_result_filter = %s
-ldapvirtual_search_timeout = 15
-ldapvirtual_scope = sub
-ldapvirtual_bind = yes
-ldapvirtual_bind_dn = @@@php_dn@@@
-ldapvirtual_bind_pw = @@@php_pw@@@
-ldapvirtual_version = 3
-
-#
-# LDAP Recipient map
-#
-
-
-#
-# LDAP Distributionlist support
-#
-
-ldapdistlist_server_host = @@@ldap_uri@@@
-ldapdistlist_search_base = @@@user_dn_list@@@
-ldapdistlist_domain = $mydestination
-ldapdistlist_query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s))
-ldapdistlist_special_result_attribute = member
-ldapdistlist_exclude_internal = yes
-ldapdistlist_result_attribute = mail
-ldapdistlist_result_filter = %s
-ldapdistlist_search_timeout = 15
-ldapdistlist_scope = sub
-ldapdistlist_bind = yes
-ldapdistlist_bind_dn = @@@php_dn@@@
-ldapdistlist_bind_pw = @@@php_pw@@@
-ldapdistlist_version = 3
-
-#
-# LDAP Transport for multilocation support
-#
-
-ldaptransport_server_host = @@@ldap_uri@@@
-ldaptransport_search_base = @@@user_dn_list@@@
-ldaptransport_query_filter = (&(mail=%s)(objectClass=kolabInetOrgPerson)(!(kolabHomeServer=$myhostname)))
-ldaptransport_result_attribute = kolabHomeServer
-ldaptransport_result_filter = smtp:[%s]
-ldaptransport_search_timeout = 15
-ldaptransport_scope = sub
-ldaptransport_bind = yes
-ldaptransport_bind_dn = @@@php_dn@@@
-ldaptransport_bind_pw = @@@php_pw@@@
-ldaptransport_version = 3
 
 @@@if postfix-enable-virus-scan@@@
 #

Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- resmgr.conf.template.in	13 Sep 2005 14:38:22 -0000	1.1
+++ resmgr.conf.template.in	13 Oct 2005 23:56:51 -0000	1.2
@@ -15,6 +15,9 @@
 // '@domain' specified after their username as part of their email address.
 $params['email_domain'] = '@@@postfix-mydomain@@@';
 
+// List of kolab hosts that are priviledged
+$params['kolabhosts'] = '@@@kolabhost|join(,)@@@';
+
 // Are we using virtual domains with Cyrus?
 $params['virtual_domains'] = true;