Skip to content

Commit

Permalink
Fixed all outstanding ansible-lint errors. No functionality changes.
Browse files Browse the repository at this point in the history
Jinja2 template files still fail linting, but this seems erroneous as it
is complaining about spacing which is already present!
  • Loading branch information
greigm authored and groggemans committed Nov 1, 2023
1 parent 86b1c05 commit 125707b
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Install sudo if not available?
sudo_package: yes
sudo_package: true

# list of sudo users
sudo_list: []
Expand All @@ -21,7 +21,7 @@ sudo_grouplist_host: []
sudo_grouplist_group: []

# Restore default sudoers file?
sudo_default_sudoers: no
sudo_default_sudoers: false

# Sudoers file to restore
sudo_default_sudoers_src_path: 'etc-sudoers'
Expand Down
26 changes: 13 additions & 13 deletions meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ galaxy_info:
description: A role for managing sudo.
company: GROG
license: MIT
min_ansible_version: 2.0
min_ansible_version: '2.0'
platforms:
- name: GenericUNIX
versions:
- all
- name: GenericBSD
versions:
- all
- name: GenericLinux
versions:
- all
- name: GenericUNIX
versions:
- all
- name: GenericBSD
versions:
- all
- name: GenericLinux
versions:
- all
galaxy_tags:
- sudo
- system
- sudo
- system

allow_duplicates: yes
allow_duplicates: true

dependencies:
- role: GROG.package
Expand Down
19 changes: 10 additions & 9 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,27 @@
state: directory
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0750
mode: "0750"

- name: Restore default sudoers file
ansible.builtin.copy:
backup: yes
backup: true
src: "{{ sudo_default_sudoers_src_path }}"
dest: '/etc/sudoers'
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0440
mode: "0440"
validate: visudo -cf %s
when: sudo_default_sudoers|bool

- name: Enable sudoers.d
ansible.builtin.lineinfile:
backup: yes
create: yes
backup: true
create: true
dest: '/etc/sudoers'
line: "#includedir {{ sudo_sudoersd_dir }}"
regexp: '^#includedir .*'
mode: "0750"
validate: visudo -cf %s

- name: Apply sudoers defaults configuration
Expand All @@ -34,7 +35,7 @@
dest: "{{ sudo_sudoersd_dir }}/00defaults"
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0440
mode: "0440"
validate: visudo -cf %s
when: sudo_defaults|length > 0

Expand All @@ -44,7 +45,7 @@
dest: "{{ sudo_sudoersd_dir }}/10aliases"
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0440
mode: "0440"
validate: visudo -cf %s
when: ( (sudo_host_aliases|length > 0) or
(sudo_user_aliases|length > 0) or
Expand All @@ -57,7 +58,7 @@
dest: "{{ sudo_sudoersd_dir }}/{{ item.sudoers_file|default('10' + item.name) }}"
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0440
mode: "0440"
validate: visudo -cf %s
when:
- item.sudo is defined
Expand All @@ -78,7 +79,7 @@
dest: "{{ sudo_sudoersd_dir }}/{{ item.sudoers_file|default('20' + item.name) }}"
owner: "{{ sudo_sudoersd_owner }}"
group: "{{ sudo_sudoersd_group }}"
mode: 0440
mode: "0440"
validate: visudo -cf %s
when:
- item.sudo is defined
Expand Down

0 comments on commit 125707b

Please sign in to comment.