diff --git a/.woodpecker.yml b/.woodpecker.yml index 1777e56..694a273 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,8 +6,8 @@ steps: image: alpine/git commands: - apk add ansible ansible-lint - #- cd slococo/playground - #- ansible-galaxy collection install . + # - cd slococo/playground + # - ansible-galaxy collection install . - ansible-galaxy collection install -r slococo/playground/requirements.yml - ansible-lint - ls -al diff --git a/slococo/playground/playbooks/main.yml b/slococo/playground/playbooks/main.yml index 41854dd..efa47aa 100644 --- a/slococo/playground/playbooks/main.yml +++ b/slococo/playground/playbooks/main.yml @@ -7,7 +7,7 @@ - role: slococo.playground.ssh_config - role: slococo.playground.local_accounts vars: - accounts: + local_accounts_list: - name: local_adm shell: /bin/bash userid: 38000087 diff --git a/slococo/playground/roles/local_accounts/README.md b/slococo/playground/roles/local_accounts/README.md index a0e936b..aa03da9 100644 --- a/slococo/playground/roles/local_accounts/README.md +++ b/slococo/playground/roles/local_accounts/README.md @@ -13,7 +13,7 @@ Role Variables -------------- ```yaml -accounts: +local_accounts_list: - name: # Username for the local user (required) shell: # Shell for the local user (required) userid: # User ID for the local user (required) @@ -28,7 +28,7 @@ Example Playbook ```yaml - hosts: servers vars: - accounts: + local_accounts_list: - name: test_user1 shell: /bin/bash userid: 1001 diff --git a/slococo/playground/roles/local_accounts/defaults/main.yml b/slococo/playground/roles/local_accounts/defaults/main.yml index 09bff2d..b1307fa 100644 --- a/slococo/playground/roles/local_accounts/defaults/main.yml +++ b/slococo/playground/roles/local_accounts/defaults/main.yml @@ -1,2 +1,2 @@ --- -accounts: [] +local_accounts_list: [] diff --git a/slococo/playground/roles/local_accounts/meta/argument_specs.yml b/slococo/playground/roles/local_accounts/meta/argument_specs.yml index 3ce97cc..0d7c497 100644 --- a/slococo/playground/roles/local_accounts/meta/argument_specs.yml +++ b/slococo/playground/roles/local_accounts/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: Ansible Role to create local users options: - accounts: + local_accounts_list: type: list required: true elements: dict @@ -42,6 +42,6 @@ argument_specs: description: Boolean value indicating whether SSH key pairs should be generated for passwordless authentication. private_key_path: type: str - required: no + required: false default: /tmp description: "Path to the private key on the Ansible control node. If not provided, the default path will be /tmp." diff --git a/slococo/playground/roles/local_accounts/tasks/main.yml b/slococo/playground/roles/local_accounts/tasks/main.yml index 4dfc50f..3e7938a 100644 --- a/slococo/playground/roles/local_accounts/tasks/main.yml +++ b/slococo/playground/roles/local_accounts/tasks/main.yml @@ -7,16 +7,16 @@ expires: "{{ (((item.expiry_date + ' 00:00:00') | to_datetime).strftime('%s')) if item.expiry_date is defined else omit }}" home: "{{ item.home | default(omit) }}" groups: "{{ item.groups | default(omit) }}" - loop: "{{ accounts }}" + loop: "{{ local_accounts_list }}" - name: Add home ansible.builtin.set_fact: accounts_with_home: "{{ accounts_with_home | default([]) + [item | combine({'home': item.home | default('/home/' + item.name)})] }}" - loop: "{{ accounts }}" + loop: "{{ local_accounts_list }}" - name: Determine key path - set_fact: - key_path: "{{ (private_key_path | default('/tmp')) | regex_replace('/$','') }}/id_rsa" + ansible.builtin.set_fact: + key_path: "{{ (private_key_path | default('/tmp')) | regex_replace('/$', '') }}/id_rsa" - name: Generate SSH key pairs for local users community.crypto.openssh_keypair: @@ -31,6 +31,7 @@ ansible.builtin.file: path: "{{ item.home }}/.ssh" state: directory + mode: '0700' loop: "{{ accounts_with_home }}" when: item.passwordless | default(false) | bool diff --git a/slococo/playground/roles/local_accounts/tests/test.yml b/slococo/playground/roles/local_accounts/tests/test.yml index d91ff12..6bd9d57 100644 --- a/slococo/playground/roles/local_accounts/tests/test.yml +++ b/slococo/playground/roles/local_accounts/tests/test.yml @@ -2,11 +2,11 @@ - name: Test the local_accounts role hosts: localhost connection: local - gather_facts: no + gather_facts: false become: true vars: - accounts: + local_accounts_list: - name: test_user1 shell: /bin/bash userid: 1001 @@ -18,4 +18,4 @@ groups: docker roles: - - {role: ../..} + - role: slococo.playground.local_accounts diff --git a/slococo/playground/roles/ssh_config/defaults/main.yml b/slococo/playground/roles/ssh_config/defaults/main.yml index 26d0c44..bc21625 100644 --- a/slococo/playground/roles/ssh_config/defaults/main.yml +++ b/slococo/playground/roles/ssh_config/defaults/main.yml @@ -1,5 +1,5 @@ --- -options: +ssh_config_options: PasswordAuthentication: 'yes' PermitEmptyPasswords: 'no' PermitRootLogin: 'no' diff --git a/slococo/playground/roles/ssh_config/meta/argument_specs.yml b/slococo/playground/roles/ssh_config/meta/argument_specs.yml index 7f704ae..0e1c2b3 100644 --- a/slococo/playground/roles/ssh_config/meta/argument_specs.yml +++ b/slococo/playground/roles/ssh_config/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: Ansible Role to manage SSH configuration options: - options: + ssh_config_options: type: dict required: false default: diff --git a/slococo/playground/roles/ssh_config/tasks/main.yml b/slococo/playground/roles/ssh_config/tasks/main.yml index 8356b68..bf705ec 100644 --- a/slococo/playground/roles/ssh_config/tasks/main.yml +++ b/slococo/playground/roles/ssh_config/tasks/main.yml @@ -6,6 +6,6 @@ line: "{{ item.key }} {{ item.value }}" state: present validate: "sshd -t -f %s" - mode: 0644 - loop: "{{ options | dict2items }}" + mode: '0644' + loop: "{{ ssh_config_options | dict2items }}" notify: Restart SSH service diff --git a/slococo/playground/roles/ssh_config/tests/test.yml b/slococo/playground/roles/ssh_config/tests/test.yml index 9a61bf3..173c320 100644 --- a/slococo/playground/roles/ssh_config/tests/test.yml +++ b/slococo/playground/roles/ssh_config/tests/test.yml @@ -2,12 +2,12 @@ - name: Test the ssh_config role hosts: localhost connection: local - gather_facts: no + gather_facts: false become: true vars: - options: + ssh_config_options: PasswordAuthentication: 'no' roles: - - {role: ../..} + - role: slococo.playground.ssh_config