Simplify sudo tasks for evolinux-users
Some checks reported errors
continuous-integration/drone/push Build encountered an error
continuous-integration/drone/pr Build is failing

Move two template creation tasks out of the loop.

This means that the task runs only once instead
of one time per user in the loop.
This commit is contained in:
Patrick Marchand 2019-08-06 17:57:35 -04:00
parent 9049a97792
commit 3feb0cc3b4
4 changed files with 25 additions and 21 deletions

View file

@ -20,9 +20,6 @@
- name: Configure sudo
include: sudo.yml
vars:
user: "{{ item.value }}"
with_dict: "{{ evolinux_users }}"
when: evolinux_users != {}
- name: Configure SSH

View file

@ -1,9 +1,34 @@
---
- name: "Verify 'evolinux' sudoers file presence for debian jessie"
template:
src: "sudoers_jessie.j2"
dest: /etc/sudoers.d/evolinux
force: no
mode: "0440"
validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux
when: ansible_distribution_release == "jessie"
- name: "Verify 'evolinux' sudoers file presence for debian 9 or bigger"
template:
src: "sudoers_stretch.j2"
dest: /etc/sudoers.d/evolinux
force: no
mode: "0440"
validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux
when: ansible_distribution_major_version | version_compare('9', '>=')
- include: sudo_jessie.yml
vars:
user: "{{ item.value }}"
with_dict: "{{ evolinux_users }}"
when: ansible_distribution_release == "jessie"
- include: sudo_stretch.yml
vars:
user: "{{ item.value }}"
with_dict: "{{ evolinux_users }}"
when: ansible_distribution_major_version | version_compare('9', '>=')
- meta: flush_handlers

View file

@ -1,14 +1,5 @@
---
- name: "Verify Evolinux sudoers file presence (jessie)"
template:
src: sudoers_jessie.j2
dest: /etc/sudoers.d/evolinux
force: no
mode: "0440"
validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux
- name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
replace:
dest: /etc/sudoers.d/evolinux

View file

@ -1,14 +1,5 @@
---
- name: "Verify 'evolinux' sudoers file presence (Debian 9 or later)"
template:
src: sudoers_stretch.j2
dest: /etc/sudoers.d/evolinux
force: no
mode: "0440"
validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux
- name: "Create '{{ evolinux_sudo_group }}' group (Debian 9 or later)"
group:
name: "{{ evolinux_sudo_group }}"