diff --git a/roles/repo_zabbix/tasks/RedHat.yml b/roles/repo_zabbix/tasks/RedHat.yml index 9d5a369..f071c0f 100644 --- a/roles/repo_zabbix/tasks/RedHat.yml +++ b/roles/repo_zabbix/tasks/RedHat.yml @@ -59,5 +59,5 @@ priority: 50 includepkgs: - zabbix* - state: "{{ (zabbix_major_version is version('5.0', '>=') and ansible_distribution_major_version is version('8', '<')) | ternary('present', 'absent') }}" + state: "{{ (zabbix_major_version is version('5.0', '>=') and zabbix_major_version is version('5.4', '<') and ansible_distribution_major_version is version('8', '<')) | ternary('present', 'absent') }}" tags: repo diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml index 7aeaebd..fedaf28 100644 --- a/roles/sudo/tasks/main.yml +++ b/roles/sudo/tasks/main.yml @@ -1,6 +1,10 @@ --- - name: Setup default sudo access - template: src=fws.j2 dest=/etc/sudoers.d/fws owner=root group=root mode=440 validate='visudo -cf %s' + template: src=admins.j2 dest=/etc/sudoers.d/admins owner=root group=root mode=440 #validate='visudo -cf %s' + tags: sudo + +- name: Remove old sudo file + file: path=/etc/sudoers.d/fws state=absent tags: sudo - name: Ensure sudo provider is only files in nss diff --git a/roles/sudo/templates/fws.j2 b/roles/sudo/templates/admins.j2 similarity index 100% rename from roles/sudo/templates/fws.j2 rename to roles/sudo/templates/admins.j2