steffen: server/kolabd/kolabd/templates ldapdistlist.cf.template, NONE, 1.1 ldaptransport.cf.template, NONE, 1.1 ldapvirtual.cf.template, NONE, 1.1 main.cf.template, 1.17, 1.18 master.cf.template, 1.11, 1.12
cvs at intevation.de
cvs at intevation.de
Tue Jul 26 03:34:19 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv15989/kolabd/templates
Modified Files:
main.cf.template master.cf.template
Added Files:
ldapdistlist.cf.template ldaptransport.cf.template
ldapvirtual.cf.template
Log Message:
ldap stuff for postfix in separate files + added anvil, tlsmgr and scache to master.cf
--- NEW FILE: ldapdistlist.cf.template ---
# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.
# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config directory
#
# LDAP Distributionlist support for postfix
#
server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
domain = $mydestination
query_filter = (&(objectClass=kolabGroupOfNames)(!(kolabDeleteFlag=*))(mail=%s))
special_result_attribute = member
exclude_internal = yes
result_attribute = mail
result_filter = %s
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255
--- NEW FILE: ldaptransport.cf.template ---
# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.
# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config directory
#
# LDAP Transport for multilocation support
#
server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
query_filter = (&(mail=%s)(objectClass=kolabInetOrgPerson)(!(kolabHomeServer=@@@fqdnhostname@@@)))
result_attribute = kolabHomeServer
result_filter = smtp:[%s]
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255
--- NEW FILE: ldapvirtual.cf.template ---
# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaralvdalens Datakonsult AB)
#
# This program is Free Software under the GNU General Public License (>=v2).
# Read the file COPYING that comes with this packages for details.
# this file is automatically written by the Kolab config backend
# manual additions are lost unless made to the template in the Kolab config directory
#
# LDAP Alias support for postfix
#
server_host = @@@ldap_uri@@@
search_base = @@@user_dn_list@@@
query_filter = (&(!(kolabDeleteFlag=*))(|(alias=%s)(mail=%s)))
result_attribute = mail
result_filter = %s
search_timeout = 15
scope = sub
bind = yes
bind_dn = @@@php_dn@@@
bind_pw = @@@php_pw@@@
version = 3
#debuglevel = 255
Index: main.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/main.cf.template,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- main.cf.template 15 Jul 2005 00:40:46 -0000 1.17
+++ main.cf.template 26 Jul 2005 01:34:17 -0000 1.18
@@ -48,9 +48,9 @@
# maps
canonical_maps = hash:@l_prefix@/etc/postfix/canonical
-virtual_maps = hash:@l_prefix@/etc/postfix/virtual, ldap:ldapdistlist, ldap:ldapvirtual
+virtual_maps = hash:@l_prefix@/etc/postfix/virtual, ldap:@l_prefix@/etc/postfix/ldapdistlist.cf, ldap:@l_prefix@/etc/postfix/ldapvirtual.cf
relocated_maps = hash:@l_prefix@/etc/postfix/relocated
-transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:ldaptransport
+transport_maps = hash:@l_prefix@/etc/postfix/transport, ldap:@l_prefix@/etc/postfix/ldaptransport.cf
alias_maps = hash:@l_prefix@/etc/postfix/aliases
alias_database = hash:@l_prefix@/etc/postfix/aliases
#virtual_mailbox_maps = $virtual_maps
@@ -129,63 +129,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: master.cf.template
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/master.cf.template,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- master.cf.template 10 Jun 2005 23:54:37 -0000 1.11
+++ master.cf.template 26 Jul 2005 01:34:17 -0000 1.12
@@ -26,6 +26,9 @@
local unix - n n - - local
#virtual unix - n n - - virtual
lmtp unix - - n - - lmtp
+anvil unix - - n - 1 anvil
+scache unix - - n - 1 scache
+tlsmgr unix - - n 1000? 1 tlsmgr
#cyrus unix - n n - - pipe flags=R user=cyrus argv=/kolab/bin/deliver -e -m ${extension} ${user}
#uucp unix - n n - - pipe flags=Fqhu user=uucp argv=/kolab/bin/uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
#ifmail unix - n n - - pipe flags=F user=ftn argv=/kolab/bin/ifmail -r $nexthop ($recipient)
More information about the commits
mailing list