add dependencies between roles

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

diff --git a/roles/postfix/tasks/postfix.yml b/roles/postfix/tasks/postfix.yml
index b39f7225741d9404a1157a0cc6fcae5c079654fc..bda22568fef15cd1af09e5cdbd40f776450db9ba 100644 (file)
--- a/roles/postfix/tasks/postfix.yml
+++ b/roles/postfix/tasks/postfix.yml
@@ -36,6 +36,7 @@
   - virtual_alias_map
   - transport_map
 - name: give postfix user access to opendkim
   - virtual_alias_map
   - transport_map
 - name: give postfix user access to opendkim

+  # we assume the user alredy exists (it is created above by installing postfix)

   when: postfix.opendkim is defined
   user:
     name: postfix
   when: postfix.opendkim is defined
   user:
     name: postfix


@@ -62,17 +63,16 @@
     path: /etc/cron.daily/mailman-check
     state: absent
 # tools
     path: /etc/cron.daily/mailman-check
     state: absent
 # tools

-- name: create newmail dir
+- block:
+  - name: create newmail dir
+    file: path=/root/newmail state=directory
+  - name: install newmail script
+    copy:
+      dest: /root/newmail/newmail
+      src: files/newmail/newmail
+      mode: u=rwx,g=rx,o=rx
+  - name: install newmail templates
+    copy:
+      dest: /root/newmail/templates.py
+      src: files/newmail/templates.py

   when: postfix.vmail_mysql_password is defined
   when: postfix.vmail_mysql_password is defined

-  file: path=/root/newmail state=directory
-- name: install newmail script
-  when: postfix.vmail_mysql_password is defined
-  copy:
-    dest: /root/newmail/newmail
-    src: files/newmail/newmail
-    mode: u=rwx,g=rx,o=rx
-- name: install newmail templates
-  when: postfix.vmail_mysql_password is defined
-  copy:
-    dest: /root/newmail/templates.py
-    src: files/newmail/templates.py