summaryrefslogtreecommitdiffstats
path: root/roles/MX/tasks
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2014-01-15 07:32:20 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:51:38 +0200
commit9304813d505baaa50294ed0d37a11d9e3f0f6c79 (patch)
tree450f263fb6e9d7cfa67cf2e1235c2c593bad14ab /roles/MX/tasks
parentab83789bd70d294623e62e0b366b6b649cb5b0af (diff)
Fix the catch-all resolution again.
We introduce a limitation on the domain-aliases: they can't have children (e.g., lists or users) any longer. The whole alias resolution, including catch-alls and domain aliases, is now done in 'virtual_alias_maps'. We stop the resolution by returning a dummy alias A -> A for mailboxes, before trying the catch-all maps. We're still using transport_maps for lists. If it turns out to be a bottleneck due to the high-latency coming from LDAP maps, (and the fact that there is a single qmgr(8) daemon), we could rewrite lists to a dummy subdomain and use a static transport_maps instead: virtual_alias_maps: mylist@example.org -> mylist#example.org@mlmmj.localhost.localdomain transport_maps: mlmmj.localhost.localdomain mlmmj:
Diffstat (limited to 'roles/MX/tasks')
-rw-r--r--roles/MX/tasks/main.yml17
1 files changed, 9 insertions, 8 deletions
diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml
index 2ffe08d..e8dadb1 100644
--- a/roles/MX/tasks/main.yml
+++ b/roles/MX/tasks/main.yml
@@ -47,17 +47,18 @@
mode=0644
with_items:
- mailbox_domains.cf
- - reserved_alias_maps
- - alias_maps.cf
- - catchall_maps.cf
- - transport_reserved_maps.pcre
- - transport_mailbox_maps.cf
- - transport_lists_maps.cf
- - transport_catchall_maps.cf
+ - reserved_alias.pcre
+ - alias.cf
+ - mailbox.cf
+ - list.cf
+ - alias_domains.cf
+ - catchall.cf
+ - transport_reserved_alias
+ - transport_list.cf
- name: Compile the Reserved Transport Maps
postmap: instance={{ postfix_instance[inst].name }}
- src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/reserved_alias_maps db=cdb
+ src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/transport_reserved_alias db=cdb
owner=root group=root
mode=0644