From 38a905dd8db65025ef5a20e85cfad6094fca63ff Mon Sep 17 00:00:00 2001 From: Tristan PILAT Date: Sat, 11 May 2019 21:34:10 +0200 Subject: [PATCH] No need for two tasks to copy evomaintenance script and template, let's use with_items instead --- .../tasks/install_vendor_debian.yml | 25 ++++++------------- .../tasks/install_vendor_openbsd.yml | 25 ++++++------------- 2 files changed, 16 insertions(+), 34 deletions(-) diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml index b64543c8..744db54a 100644 --- a/evomaintenance/tasks/install_vendor_debian.yml +++ b/evomaintenance/tasks/install_vendor_debian.yml @@ -26,28 +26,19 @@ tags: - evomaintenance -- name: Script is installed +- name: Evomaintenance script and template are installed copy: - src: evomaintenance.sh - dest: /usr/share/scripts/evomaintenance.sh - mode: "0700" + src: "{{ item.src }}" + dest: "{{ item.dest }}" owner: root group: root + mode: "{{ item.mode }}" force: yes backup: yes - tags: - - evomaintenance - -- name: Template is installed - copy: - src: evomaintenance.tpl - dest: /usr/share/scripts/evomaintenance.tpl - mode: "0600" - owner: root - group: root - force: yes - backup: yes - tags: + with_items: + - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' } + - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' } + tags: - evomaintenance - name: Configuration is installed diff --git a/evomaintenance/tasks/install_vendor_openbsd.yml b/evomaintenance/tasks/install_vendor_openbsd.yml index 7071bc0f..22600cd0 100644 --- a/evomaintenance/tasks/install_vendor_openbsd.yml +++ b/evomaintenance/tasks/install_vendor_openbsd.yml @@ -20,28 +20,19 @@ tags: - evomaintenance -- name: Script is installed +- name: Evomaintenance script and template are installed copy: - src: evomaintenance.sh - dest: /usr/share/scripts/evomaintenance.sh - mode: "0700" + src: "{{ item.src }}" + dest: "{{ item.dest }}" owner: root group: wheel + mode: "{{ item.mode }}" force: yes backup: yes - tags: - - evomaintenance - -- name: Template is installed - copy: - src: evomaintenance.tpl - dest: /usr/share/scripts/evomaintenance.tpl - mode: "0600" - owner: root - group: wheel - force: yes - backup: yes - tags: + with_items: + - { src: 'evomaintenance.sh', dest: '/usr/share/scripts/', mode: '0700' } + - { src: 'evomaintenance.tpl', dest: '/usr/share/scripts/', mode: '0600' } + tags: - evomaintenance - name: Configuration is installed