fix: add linter

This commit is contained in:
Markus Pesch 2023-02-08 18:25:07 +01:00
parent 7f0d5aad28
commit 9f43029353
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
5 changed files with 16 additions and 20 deletions

View File

@ -16,8 +16,4 @@ galaxy_info:
versions: versions:
- "35" - "35"
galaxy_tags:
- unix_users
- unix_groups
dependencies: [] dependencies: []

View File

@ -4,11 +4,11 @@
group: group:
name: "{{ unix_group.key }}" name: "{{ unix_group.key }}"
state: "{{ unix_group.value.state | default('present') }}" state: "{{ unix_group.value.state | default('present') }}"
when: unix_group.value.gid is not defined or unix_group.value.gid is defined and unix_group.value.gid == "" when: unix_group.value.gid is not defined or unix_group.value.gid is defined and unix_group.value.gid | length <= 0
- name: Create unix group {{ unix_group.key }} with pre-defined gid - name: Create unix group {{ unix_group.key }} with pre-defined gid
group: group:
name: "{{ unix_group.key }}" name: "{{ unix_group.key }}"
gid: "{{ unix_group.value.gid }}" gid: "{{ unix_group.value.gid }}"
state: "{{ unix_group.value.state | default('present') }}" state: "{{ unix_group.value.state | default('present') }}"
when: unix_group.value.gid is defined and unix_group.value.gid != "" when: unix_group.value.gid is defined and unix_group.value.gid | length > 0

View File

@ -1,8 +1,8 @@
--- ---
- name: Define home directory for user {{ unix_user.key }} - name: Define home directory for user {{ unix_user.key }}
set_fact: ansible.builtin.set_fact:
user_user_home: "{{ unix_user.value.home | default('/home/' + unix_user.key) }}" user_user_home: "{{ unix_user.value.home | default('/home/' + unix_user.key) }}"
- name: Create unix user {{ unix_user.key }} without additional groups and uid - name: Create unix user {{ unix_user.key }} without additional groups and uid
user: user:
@ -57,7 +57,7 @@
when: "unix_user.value.groups is defined and unix_user.value.uid is not defined" when: "unix_user.value.groups is defined and unix_user.value.uid is not defined"
- name: Create .ssh directory for user {{ unix_user.key }} - name: Create .ssh directory for user {{ unix_user.key }}
file: ansible.builtin.file:
path: "{{ user_user_home }}/.ssh" path: "{{ user_user_home }}/.ssh"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
group: "{{ unix_user.value.group | default('users') }}" group: "{{ unix_user.value.group | default('users') }}"
@ -65,7 +65,7 @@
state: directory state: directory
- name: Create authorized_keys file for user {{ unix_user.key }} - name: Create authorized_keys file for user {{ unix_user.key }}
template: ansible.builtin.template:
src: authorized_keys.j2 src: authorized_keys.j2
dest: "{{ user_user_home }}/.ssh/authorized_keys" dest: "{{ user_user_home }}/.ssh/authorized_keys"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
@ -74,13 +74,13 @@
when: unix_user.value.ssh.authorized_keys is defined and unix_user.value.ssh.authorized_keys | length > 0 when: unix_user.value.ssh.authorized_keys is defined and unix_user.value.ssh.authorized_keys | length > 0
- name: Remove authorized_keys file for user {{ unix_user.key }} - name: Remove authorized_keys file for user {{ unix_user.key }}
file: ansible.builtin.file:
path: "{{ user_user_home }}/.ssh/authorized_keys" path: "{{ user_user_home }}/.ssh/authorized_keys"
state: absent state: absent
when: unix_user.value.ssh.authorized_keys is not defined or unix_user.value.ssh.authorized_keys | length <= 0 when: unix_user.value.ssh.authorized_keys is not defined or unix_user.value.ssh.authorized_keys | length <= 0
- name: Create private SSH keys for user {{ unix_user.key }} - name: Create private SSH keys for user {{ unix_user.key }}
copy: ansible.builtin.copy:
src: "{{ playbook_dir }}/ssh/private_keys/{{ item }}" src: "{{ playbook_dir }}/ssh/private_keys/{{ item }}"
dest: "{{ user_user_home }}/.ssh/{{ item }}" dest: "{{ user_user_home }}/.ssh/{{ item }}"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
@ -101,7 +101,7 @@
when: unix_user.value.ssh.private_keys is defined and unix_user.value.ssh.private_keys | length >= 0 when: unix_user.value.ssh.private_keys is defined and unix_user.value.ssh.private_keys | length >= 0
- name: Correct permissions of public SSH keys for user {{ unix_user.key }} - name: Correct permissions of public SSH keys for user {{ unix_user.key }}
file: ansible.builtin.file:
path: "{{ user_user_home }}/.ssh/{{ item }}.pub" path: "{{ user_user_home }}/.ssh/{{ item }}.pub"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
group: "{{ unix_user.value.group | default('users') }}" group: "{{ unix_user.value.group | default('users') }}"
@ -111,7 +111,7 @@
when: unix_user.value.ssh.private_keys is defined and unix_user.value.ssh.private_keys | length >= 0 when: unix_user.value.ssh.private_keys is defined and unix_user.value.ssh.private_keys | length >= 0
- name: Create custom SSH client config for user {{ unix_user.key }} - name: Create custom SSH client config for user {{ unix_user.key }}
template: ansible.builtin.template:
src: config.j2 src: config.j2
dest: "{{ user_user_home }}/.ssh/config" dest: "{{ user_user_home }}/.ssh/config"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
@ -120,13 +120,13 @@
when: unix_user.value.ssh.config is defined and unix_user.value.ssh.config | length >= 0 when: unix_user.value.ssh.config is defined and unix_user.value.ssh.config | length >= 0
- name: Remove custom SSH client config for user {{ unix_user.key }} - name: Remove custom SSH client config for user {{ unix_user.key }}
file: ansible.builtin.file:
path: "{{ user_user_home }}/.ssh/config" path: "{{ user_user_home }}/.ssh/config"
state: absent state: absent
when: unix_user.value.ssh.config is not defined when: unix_user.value.ssh.config is not defined
- name: Create .forward file to forward emails for user {{ unix_user.key }} - name: Create .forward file to forward emails for user {{ unix_user.key }}
template: ansible.builtin.template:
src: forward.j2 src: forward.j2
dest: "{{ user_user_home }}/.forward" dest: "{{ user_user_home }}/.forward"
owner: "{{ unix_user.key }}" owner: "{{ unix_user.key }}"
@ -135,7 +135,7 @@
when: unix_user.value.email is defined when: unix_user.value.email is defined
- name: Remove .forward file to forward emails for user {{ unix_user.key }} - name: Remove .forward file to forward emails for user {{ unix_user.key }}
file: ansible.builtin.file:
path: "{{ user_user_home }}/.forward" path: "{{ user_user_home }}/.forward"
state: absent state: absent
when: unix_user.value.email is not defined when: unix_user.value.email is not defined

View File

@ -3,4 +3,4 @@
- name: Remove unix group {{ unix_group.key }} - name: Remove unix group {{ unix_group.key }}
group: group:
name: "{{ unix_group.key }}" name: "{{ unix_group.key }}"
state: absent state: absent

View File

@ -4,4 +4,4 @@
user: user:
name: "{{ unix_user.key }}" name: "{{ unix_user.key }}"
state: absent state: absent
remove: yes remove: true