diff --git a/defaults/main.yml b/defaults/main.yml index ac845ca..5b6e7a2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -7,4 +7,4 @@ sudo_users_sudoers: {} # group: "" # Group or User, not booth! # nopassword: true # runas: "" # Optional -# user: "markus": # Group or User, not booth! \ No newline at end of file +# user: "markus": # Group or User, not booth! diff --git a/tasks/main.yml b/tasks/main.yml index 5ecd7a9..77271b0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,10 +1,10 @@ --- - name: Load variables - include_vars: "{{ ansible_os_family }}.yml" + ansible.builtin.include_vars: "{{ ansible_os_family }}.yml" - name: Verify variables - include_tasks: "{{ lookup('first_found', params) }}" + ansible.builtin.include_vars: "{{ lookup('first_found', params) }}" vars: params: files: @@ -13,29 +13,29 @@ - "verify_vars.yml" - name: Install sudo - package: + ansible.builtin.package: name: "{{ item }}" state: present with_items: "{{ sudo_users_package_names }}" - name: Enable includedir directive - lineinfile: + ansible.builtin.lineinfile: dest: /etc/sudoers state: present regexp: "^(#)+(\\s)*includedir(\\s)*/etc/sudoers.d" line: "#includedir /etc/sudoers.d" validate: 'visudo --check --file %s' - mode: 0440 - owner: root - group: root + mode: "0440" + owner: "root" + group: "root" - name: Flush drop-in files of sudoers.d - file: + ansible.builtin.file: state: "{{ item }}" path: "/etc/sudoers.d" - owner: root - group: root - mode: 0750 + owner: "root" + group: "root" + mode: "0750" with_items: - absent - directory @@ -92,4 +92,4 @@ - "{{ sudo_users_sudoers }}" when: item.user is not defined and item.group is defined and item.group | length > 0 and - item.runas is defined and item.runas | length > 0 \ No newline at end of file + item.runas is defined and item.runas | length > 0 diff --git a/tasks/verify_vars.yml b/tasks/verify_vars.yml index fd878ad..d9471c2 100644 --- a/tasks/verify_vars.yml +++ b/tasks/verify_vars.yml @@ -3,7 +3,7 @@ - name: Verify if not user and group exists for each entry ansible.builtin.assert: that: - - (item.user is defined and item.group is not defined) or - (item.user is not defined and item.group is defined) + - (item.user is defined and item.group is not defined) or + (item.user is not defined and item.group is defined) with_items: - - "{{ sudo_users_sudoers }}" \ No newline at end of file + - "{{ sudo_users_sudoers }}" diff --git a/vars/Archlinux.yml b/vars/Archlinux.yml index 7074266..5076e15 100644 --- a/vars/Archlinux.yml +++ b/vars/Archlinux.yml @@ -1,4 +1,4 @@ --- sudo_users_package_names: -- sudo \ No newline at end of file +- sudo diff --git a/vars/Debian.yml b/vars/Debian.yml index 7074266..5076e15 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -1,4 +1,4 @@ --- sudo_users_package_names: -- sudo \ No newline at end of file +- sudo diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 7074266..5076e15 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,4 +1,4 @@ --- sudo_users_package_names: -- sudo \ No newline at end of file +- sudo