From 0853c2afdc2ddba11692ef17bb859104d47071e0 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 14 Jan 2014 05:58:33 +0100
Subject: Fix catchall resolution.

It has to be performed last, to give a chance to be accepted as a
regular mailbox.

We introduce a new, dedicated, smtpd daemon whose only purpose is to
resolve catch-alls.
---
 roles/MX/tasks/main.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'roles/MX/tasks')

diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml
index de6924b..2ffe08d 100644
--- a/roles/MX/tasks/main.yml
+++ b/roles/MX/tasks/main.yml
@@ -40,23 +40,24 @@
         owner=root group=root
         mode=0755
 
-- name: Copy lookups tables
-  copy: src=etc/postfix/virtual/{{ item }}
-        dest=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/{{ item }}
-        owner=root group=root
-        mode=0644
+- name: Copy lookup tables
+  template: src=etc/postfix/virtual/{{ item }}.j2
+            dest=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/{{ item }}
+            owner=root group=root
+            mode=0644
   with_items:
     - mailbox_domains.cf
-    - reserved_maps.pcre
+    - reserved_alias_maps
     - alias_maps.cf
-    - alias_catchall_maps.cf
-    - mailbox_maps.cf
+    - catchall_maps.cf
+    - transport_reserved_maps.pcre
+    - transport_mailbox_maps.cf
     - transport_lists_maps.cf
-    - reserved_transport_maps
+    - transport_catchall_maps.cf
 
 - name: Compile the Reserved Transport Maps
-  postmap: cmd=postalias instance={{ postfix_instance[inst].name }}
-           src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/reserved_transport_maps db=cdb
+  postmap: instance={{ postfix_instance[inst].name }}
+           src=/etc/postfix-{{ postfix_instance[inst].name }}/virtual/reserved_alias_maps db=cdb
            owner=root group=root
            mode=0644
 
-- 
cgit v1.2.3