ignore more SSH errors

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

diff --git a/roles/email/tasks/postfix.yml b/roles/email/tasks/postfix.yml
index 67e459d738aa45d9a16fe5bbcb3578357e8b1ed6..d59144d9b88f3f59c4d675694b4d536c7bad7291 100644 (file)
--- a/roles/email/tasks/postfix.yml
+++ b/roles/email/tasks/postfix.yml
@@ -13,6 +13,7 @@
   loop:
   - main.cf
   - master.cf
   loop:
   - main.cf
   - master.cf

+  - postscreen_access.cidr

   notify: postfix
 - name: install postfix mysql config
   when: postfix.dovecot is defined
   notify: postfix
 - name: install postfix mysql config
   when: postfix.dovecot is defined


@@ -36,7 +37,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 +46,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 +67,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


@@ -78,8 +76,6 @@
   command: postmap /etc/postfix/transport_map
   notify: postfix
 # cronjobs
   command: postmap /etc/postfix/transport_map
   notify: postfix
 # cronjobs

-- name: delete old local-mail cronjob
-  file: path=/etc/cron.daily/local-mail state=absent

 - name: install check-for-local-mail cronjob
   copy:
     dest: /etc/cron.daily/check-for-local-mail
 - name: install check-for-local-mail cronjob
   copy:
     dest: /etc/cron.daily/check-for-local-mail