View | Details | Raw Unified | Return to bug 45205 | Differences between
and this patch

Collapse All | Expand All

(-)mail/univention-mail-postfix/conffiles/etc/postfix/main.cf.d/30_maps (-1 / +2 lines)
 Lines 34-41   print('') Link Here 
34
# enable virtual tables if requested
34
# enable virtual tables if requested
35
if configRegistry.is_true('mail/postfix/virtual/enabled', False):
35
if configRegistry.is_true('mail/postfix/virtual/enabled', False):
36
36
37
	default_virtual_alias_maps = 'hash:/etc/postfix/virtual, ldap:/etc/postfix/ldap.groups, ldap:/etc/postfix/ldap.distlist, ldap:/etc/postfix/ldap.virtual, ldap:/etc/postfix/ldap.external_aliases, ldap:/etc/postfix/ldap.sharedfolderremote, ldap:/etc/postfix/ldap.sharedfolderlocal_aliases, ldap:/etc/postfix/ldap.virtual_mailbox, ldap:/etc/postfix/ldap.sharedfolderlocal'
38
	default_virtual_mailbox_maps = 'ldap:/etc/postfix/ldap.virtual_mailbox, ldap:/etc/postfix/ldap.sharedfolderlocal'
37
	default_virtual_mailbox_maps = 'ldap:/etc/postfix/ldap.virtual_mailbox, ldap:/etc/postfix/ldap.sharedfolderlocal'
38
	# Bug #45205: adding mailbox_maps to alias_maps, so both will be together in the unionmap below
39
	default_virtual_alias_maps = 'hash:/etc/postfix/virtual, ldap:/etc/postfix/ldap.groups, ldap:/etc/postfix/ldap.distlist, ldap:/etc/postfix/ldap.virtual, ldap:/etc/postfix/ldap.external_aliases, ldap:/etc/postfix/ldap.sharedfolderremote, ldap:/etc/postfix/ldap.sharedfolderlocal_aliases, {}'.format(default_virtual_mailbox_maps)
39
	default_virtual_domains = 'ldap:/etc/postfix/ldap.virtualdomains'
40
	default_virtual_domains = 'ldap:/etc/postfix/ldap.virtualdomains'
40
41
41
	virtual_alias_domains = re.split(',\s*', configRegistry.get('mail/postfix/virtual/alias/domains', '' ))
42
	virtual_alias_domains = re.split(',\s*', configRegistry.get('mail/postfix/virtual/alias/domains', '' ))

Return to bug 45205