summaryrefslogtreecommitdiffstats
path: root/roles/common/tasks
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2013-12-02 22:39:56 +0100
committerGuilhem Moulin <guilhem@fripost.org>2015-06-07 02:51:08 +0200
commitc7080c68fb4594f01a2edc98a2014c109a5afe16 (patch)
tree1b5eb6b14ca62493d39bca40ceb98737ac1765ff /roles/common/tasks
parent7d1622f3e5db18b40cab6cecfd3c2f1fab20d782 (diff)
wibble
Diffstat (limited to 'roles/common/tasks')
-rw-r--r--roles/common/tasks/mail.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml
index c562c42..e8d61a8 100644
--- a/roles/common/tasks/mail.yml
+++ b/roles/common/tasks/mail.yml
@@ -16,50 +16,49 @@
- Restart Postfix
- name: Link the dynamic maps & master.cf of each children to the master's
# main.cf is specialized to each dedicated role, though
file: src=../postfix/{{ item.1 }}
dest=/etc/postfix-{{ postfix_instance[item.0].name }}/{{ item.1 }}
owner=root group=root
state=link force=yes
register: r2
with_nested:
- postfix_instance.keys() | intersect(group_names) | list
- [ 'dynamicmaps.cf', 'master.cf' ]
notify:
- Restart Postfix
- name: Configure Postfix (1)
copy: src=etc/postfix/{{ item }}
dest=/etc/postfix/{{ item }}
owner=root group=root
mode=0644
- register: r3
with_items:
- master.cf
- generic.pcre
notify:
- Reload Postfix
- name: Configure Postfix (2)
template: src=etc/postfix/main.cf.j2
dest=/etc/postfix/main.cf
owner=root group=root
mode=0644
- register: r4
+ register: r3
notify:
- Restart Postfix
- name: Update the static local Postfix database
postmap: cmd=postalias src=/etc/aliases db=cdb
owner=root group=root
mode=0644
# We're using CDB
- name: Delete /etc/aliases.db
file: path=/etc/aliases.db state=absent
- name: Start Postfix
service: name=postfix state=started
- when: not (r1.changed or r2.changed or r3.changed or r4.changed)
+ when: not (r1.changed or r2.changed or r3.changed)
- meta: flush_handlers