diff --git a/tasks/main.yml b/tasks/main.yml index a534b629b18918cf2ba4c2b244550a78953d4c40..1211723a80cb8c2104c67bc913322dbfe20c0fa4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -10,11 +10,6 @@ - users_use_sudo in [ True, False ] - users_prune in [ True, False ] # OpenBSD 5.7 was the last version that came with sudo installed. - - > - ansible_os_family != 'OpenBSD' or - ansible_distribution_version|version_compare('5.7', '<=') or - ansible_distribution_version in users_sudo_pkg or - not users_use_sudo - include: sudo.yml when: users_use_sudo diff --git a/tasks/sudo.yml b/tasks/sudo.yml index 89e4c9f9d7f69dedbe6808b8a27d7ab70f83b492..623da82c9b424c5d929536c0216f70d1ff7cf060 100644 --- a/tasks/sudo.yml +++ b/tasks/sudo.yml @@ -11,7 +11,7 @@ - name: pkg install sudo when: ansible_pkg_mgr == 'openbsd_pkg' and ansible_distribution_version|version_compare('5.7', '>') openbsd_pkg: - name: '{{ users_sudo_pkg[ansible_distribution_version] }}' + name: sudo%1.8 state: present - name: Create sudoers.d directory diff --git a/vars/main.yml b/vars/main.yml index c51737ea5c5d38e012b4edd04dd65b53d0ab52c2..2bfeb2297cd47af4d096fa5ce5a92e76f2ae5858 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -8,11 +8,6 @@ aliases_file: OpenBSD: /etc/mail/aliases Debian: /etc/aliases -users_sudo_pkg: - '5.8': sudo-1.8.14.3 - '5.9': sudo-1.8.15 - '6.0': sudo-1.8.17.1 - users_unique_groups: '{{ users|selectattr("groups", "defined")|sum(attribute="groups", start=[])|list|unique }}' users_sudo_group: "{{ 'wheel' if ansible_os_family == 'OpenBSD' else 'sudo' }}"