don't re-patch (manually) patched mailman

[ansible.git] / roles / email / tasks / postfix.yml

diff --git a/roles/email/tasks/postfix.yml b/roles/email/tasks/postfix.yml
index 67e459d738aa45d9a16fe5bbcb3578357e8b1ed6..a76cc250ea5d36e101e3fc4feeb5e247996588cb 100644 (file)
--- a/roles/email/tasks/postfix.yml
+++ b/roles/email/tasks/postfix.yml
@@ -36,7 +36,6 @@
   notify: postfix
 # maps
 - name: create empty virtual_alias_map
   notify: postfix
 # maps
 - name: create empty virtual_alias_map

-  when: postfix.virtual_mailbox_domains is defined

   register: virtual_alias_map
   copy:
     dest: /etc/postfix/virtual_alias_map
   register: virtual_alias_map
   copy:
     dest: /etc/postfix/virtual_alias_map


@@ -46,13 +45,12 @@
   when: virtual_alias_map.changed
   command: postmap /etc/postfix/virtual_alias_map
   notify: postfix
   when: virtual_alias_map.changed
   command: postmap /etc/postfix/virtual_alias_map
   notify: postfix

-- name: create empty sender_transport_map
+- name: create sender_transport_map

   when: postfix.smtp_outgoing is defined
   register: sender_transport_map
   when: postfix.smtp_outgoing is defined
   register: sender_transport_map

-  copy:
+  template:

     dest: /etc/postfix/sender_transport_map
     dest: /etc/postfix/sender_transport_map

-    content: ""
-    force: no
+    src: templates/sender_transport_map

 - name: postmap sender_transport_map
   when: sender_transport_map.changed
   command: postmap /etc/postfix/sender_transport_map
 - name: postmap sender_transport_map
   when: sender_transport_map.changed
   command: postmap /etc/postfix/sender_transport_map


@@ -68,7 +66,6 @@
   command: postmap /etc/postfix/relay_clientcerts
   notify: postfix
 - name: create transport_map
   command: postmap /etc/postfix/relay_clientcerts
   notify: postfix
 - name: create transport_map

-  when: postfix.virtual_mailbox_domains is defined

   register: transport_map
   template:
     dest: /etc/postfix/transport_map
   register: transport_map
   template:
     dest: /etc/postfix/transport_map