diff options
| -rw-r--r-- | roles/bacula-dir/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/common/tasks/bacula.yml | 2 | ||||
| -rw-r--r-- | roles/common/tasks/mail.yml | 4 | ||||
| -rw-r--r-- | roles/munin-master/tasks/main.yml | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/roles/bacula-dir/tasks/main.yml b/roles/bacula-dir/tasks/main.yml index 1dd0683..f86d713 100644 --- a/roles/bacula-dir/tasks/main.yml +++ b/roles/bacula-dir/tasks/main.yml @@ -26,51 +26,51 @@ notify: - Restart stunnel tags: - genkey - name: Fetch Bacula Dir X.509 certificate # Ensure we don't fetch private data become: False fetch: src=/etc/stunnel/certs/{{ inventory_hostname_short }}-dir.pem dest=certs/bacula/ fail_on_missing=yes flat=yes tags: - genkey - name: Copy Bacula SD X.509 certificates copy: src=certs/bacula/{{ hostvars[item].inventory_hostname_short }}-sd.pem dest=/etc/stunnel/certs/ owner=root group=root mode=0644 - with_items: groups['bacula-sd'] | difference([inventory_hostname]) | sort + with_items: "{{ groups['bacula-sd'] | difference([inventory_hostname]) | sort }}" register: r2 notify: - Restart stunnel - name: Copy Bacula FD X.509 certificates copy: src=certs/bacula/{{ hostvars[item].inventory_hostname_short }}-fd.pem dest=/etc/stunnel/certs/ owner=root group=root mode=0644 - with_items: groups.all | difference([inventory_hostname]) | sort + with_items: "{{ groups.all | difference([inventory_hostname]) | sort }}" register: r3 notify: - Restart stunnel - name: Configure stunnel template: src=etc/stunnel/bacula-dir.conf.j2 dest=/etc/stunnel/bacula-dir.conf owner=root group=root mode=0644 register: r4 notify: - Restart stunnel - name: Start stunnel service: name=stunnel4 pattern=/usr/bin/stunnel4 state=started when: not (r1.changed or r2.changed or r3.changed or r4.changed) - meta: flush_handlers diff --git a/roles/common/tasks/bacula.yml b/roles/common/tasks/bacula.yml index 91b37c8..e29f01c 100644 --- a/roles/common/tasks/bacula.yml +++ b/roles/common/tasks/bacula.yml @@ -37,41 +37,41 @@ flat=yes tags: - genkey - name: Copy Bacula Dir X.509 certificates assemble: src=certs/bacula regexp="-dir\.pem$" remote_src=no dest=/etc/stunnel/certs/bacula-dirs.pem owner=root group=root mode=0644 register: r2 when: "'bacula-dir' not in group_names" notify: - Restart stunnel - name: Copy Bacula SD X.509 certificates copy: src=certs/bacula/{{ hostvars[item].inventory_hostname_short }}-sd.pem dest=/etc/stunnel/certs/ owner=root group=root mode=0644 register: r3 - with_items: groups['bacula-sd'] | difference([inventory_hostname]) + with_items: "{{ groups['bacula-sd'] | difference([inventory_hostname]) }}" notify: - Restart stunnel - name: Configure stunnel template: src=etc/stunnel/bacula-fd.conf.j2 dest=/etc/stunnel/bacula-fd.conf owner=root group=root mode=0644 register: r4 when: "'bacula-dir' not in group_names or 'bacula-sd' not in group_names" notify: - Restart stunnel - name: Start stunnel service: name=stunnel4 pattern=/usr/bin/stunnel4 state=started when: not (r1.changed or r2.changed or r3.changed or r4.changed) - meta: flush_handlers diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml index 273dc5c..cd3020b 100644 --- a/roles/common/tasks/mail.yml +++ b/roles/common/tasks/mail.yml @@ -1,45 +1,45 @@ - name: Install Postfix apt: pkg={{ item }} with_items: # That one is nicer than GNU mailutils' mailx(1) - heirloom-mailx - postfix - postfix-cdb - name: Create Postfix instances postmulti: instance={{ postfix_instance[item].name }} group={{ postfix_instance[item].group | default('') }} register: r1 - with_items: postfix_instance.keys() | intersect(group_names) | list + with_items: "{{ postfix_instance.keys() | intersect(group_names) | list }}" notify: - 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 + - "{{ postfix_instance.keys() | intersect(group_names) | list }}" - [ 'dynamicmaps.cf', 'master.cf' ] notify: - Restart Postfix - name: Configure Postfix (1) copy: src=etc/postfix/master.cf dest=/etc/postfix/master.cf owner=root group=root mode=0644 register: r3 notify: - Restart Postfix - name: Configure Postfix (2) template: src=etc/postfix/main.cf.j2 dest=/etc/postfix/main.cf owner=root group=root mode=0644 notify: - Reload Postfix diff --git a/roles/munin-master/tasks/main.yml b/roles/munin-master/tasks/main.yml index 5dd1151..4b3cfb7 100644 --- a/roles/munin-master/tasks/main.yml +++ b/roles/munin-master/tasks/main.yml @@ -83,41 +83,41 @@ file: src=../sites-available/munin dest=/etc/nginx/sites-enabled/munin owner=root group=root state=link force=yes register: r2 notify: - Restart Nginx - name: Start Nginx service: name=nginx state=started when: not (r1.changed or r2.changed) - meta: flush_handlers - name: Copy munin-node X.509 certificates copy: src=certs/munin/{{ item }}.pem dest=/etc/stunnel/certs/munin-{{ hostvars[item].inventory_hostname_short }}.pem owner=root group=root mode=0644 - with_items: groups.all | difference([inventory_hostname]) + with_items: "{{ groups.all | difference([inventory_hostname]) }}" register: r1 notify: - Restart stunnel - name: Configure stunnel template: src=etc/stunnel/munin-master.conf.j2 dest=/etc/stunnel/munin-master.conf owner=root group=root mode=0644 register: r2 notify: - Restart stunnel - name: Start stunnel service: name=stunnel4 pattern=/usr/bin/stunnel4 state=started when: not (r1.changed or r2.changed) - meta: flush_handlers |