evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 33 Wiki Activity

evolinux-users: no need to repeat condition

Browse source
This commit is contained in:
Jérémy Lecour 2017-10-06 12:05:07 +02:00 committed by Jérémy Lecour
parent 2b253e075c
commit fedbc5b579
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
evolinux-users/tasks/sudo_jessie.yml
View file

@ -8,7 +8,6 @@
mode: "0440" mode: "0440"
validate: '/usr/sbin/visudo -cf %s' validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux register: copy_sudoers_evolinux
when: ansible_distribution_release == "jessie"
- name: "Add user in sudoers file for '{{ user.name }}' (jessie)" - name: "Add user in sudoers file for '{{ user.name }}' (jessie)"
replace: replace:
@ -16,6 +15,4 @@
regexp: '^(User_Alias\s+ADMINS\s+=((?!{{ user.name }}).)*)$' regexp: '^(User_Alias\s+ADMINS\s+=((?!{{ user.name }}).)*)$'
replace: '\1,{{ user.name }}' replace: '\1,{{ user.name }}'
validate: '/usr/sbin/visudo -cf %s' validate: '/usr/sbin/visudo -cf %s'
when: when: not copy_sudoers_evolinux.changed
- ansible_distribution_release == "jessie"
- not copy_sudoers_evolinux.changed

3
evolinux-users/tasks/sudo_stretch.yml
View file

@ -7,17 +7,14 @@
force: no force: no
validate: '/usr/sbin/visudo -cf %s' validate: '/usr/sbin/visudo -cf %s'
register: copy_sudoers_evolinux register: copy_sudoers_evolinux
when: ansible_distribution_major_version | version_compare('9', '>=')
- name: "Create evolinux-sudo group (Debian 9 or later)" - name: "Create evolinux-sudo group (Debian 9 or later)"
group: group:
name: "{{ evolinux_sudo_group }}" name: "{{ evolinux_sudo_group }}"
system: yes system: yes
when: ansible_distribution_major_version | version_compare('9', '>=')
- name: "Add user to evolinux-sudo group (Debian 9 or later)" - name: "Add user to evolinux-sudo group (Debian 9 or later)"
user: user:
name: '{{ user.name }}' name: '{{ user.name }}'
groups: "{{ evolinux_sudo_group }}" groups: "{{ evolinux_sudo_group }}"
append: yes append: yes
when: ansible_distribution_major_version | version_compare('9', '>=')