Skip to content

Commit ff9c030

Browse files
committed
Improved defaults
1 parent d528604 commit ff9c030

File tree

7 files changed

+13
-15
lines changed

7 files changed

+13
-15
lines changed

.ansible-lint

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
warn_list:
33
- role-name
4+
- name[play]
45
- name[casing]
5-
- '204'

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ jobs:
6565
python-version: '3.x'
6666

6767
- name: Install test dependencies
68-
run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
68+
run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
6969

7070
- name: Run Molecule tests
7171
run: |
7272
molecule test
7373
env:
7474
ANSIBLE_FORCE_COLOR: '1'
75-
ANSIBLE_VERBOSITY: '3'
75+
ANSIBLE_VERBOSITY: '2'
7676
MOLECULE_DEBUG: '1'
7777
MOLECULE_DISTRO: "${{ matrix.distro }}"
7878
PY_COLORS: '1'

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ None
3131
* `ssh_keys_private_keys.{n}.group`: [default: `owner`]: The name of the group that should own the file
3232
* `ssh_keys_private_keys.{n}.mode`: [default: `0600`]: The UNIX permission mode bits of the file
3333
* `ssh_keys_private_keys.{n}.src`: [required]: The local path of the key
34-
* `ssh_keys_private_keys.{n}.dest`: [default: `id_rsa`]: The remote path of the key (relative to `home/.ssh/`)
34+
* `ssh_keys_private_keys.{n}.dest`: [default: `src | basename`]: The remote path of the key (relative to `home/.ssh/`)
3535
* `ssh_keys_private_keys.{n}.dest_absolute`: [optional]: The remote path of the key
3636
* `ssh_keys_private_keys.{n}.dest_managed`: [default: `true`]: Whether or not the remote path of the key should be created
3737
* `ssh_keys_private_keys.{n}.state`: [default: `present`]: State
@@ -41,7 +41,7 @@ None
4141
* `ssh_keys_public_keys.{n}.group`: [default: `owner`]: The name of the group that should own the file
4242
* `ssh_keys_public_keys.{n}.mode`: [default: `0644`]: The UNIX permission mode bits of the file
4343
* `ssh_keys_public_keys.{n}.src`: [required]: The local path of the key
44-
* `ssh_keys_public_keys.{n}.dest`: [default: `id_rsa.pub`]: The remote path of the key (relative to `home/.ssh/`)
44+
* `ssh_keys_public_keys.{n}.dest`: [default: `src | basename`]: The remote path of the key (relative to `home/.ssh/`)
4545
* `ssh_keys_public_keys.{n}.dest_absolute`: [optional]: The remote path of the key
4646
* `ssh_keys_public_keys.{n}.dest_managed`: [default: `true`]: Whether or not the remote path of the key should be created
4747
* `ssh_keys_public_keys.{n}.state`: [default: `present`]: State
@@ -74,13 +74,13 @@ None
7474
comment: RSA key
7575
ssh_keys_private_keys:
7676
- owner: root
77-
src: ../../../files/ssh-keys/id_rsa
77+
src: "{{ playbook_dir }}/files/ssh-keys/id_rsa"
7878
ssh_keys_public_keys:
7979
- owner: root
80-
src: ../../../files/ssh-keys/id_rsa.pub
80+
src: "{{ playbook_dir }}/files/ssh-keys/id_rsa.pub"
8181
ssh_keys_authorized_keys:
8282
- owner: root
83-
src: ../../../files/ssh-keys/id_rsa.pub
83+
src: "{{ playbook_dir }}/files/ssh-keys/id_rsa.pub"
8484
ssh_keys_known_hosts:
8585
- hostname: github.com
8686
enctype: ssh-rsa

tasks/general.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
---
33
- name: general | create ssh directory
44
ansible.builtin.file:
5-
path: "{{ (item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(ssh_keys_private_key_filename)))) | dirname }}"
5+
path: "{{ (item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(item.src | basename)))) | dirname }}"
66
state: directory
77
owner: "{{ item.owner }}"
88
group: "{{ item.group | default(item.owner) }}"

tasks/private-keys.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: private-keys | add
44
ansible.builtin.copy:
55
src: "{{ item.src }}"
6-
dest: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(ssh_keys_private_key_filename))) }}"
6+
dest: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(item.src | basename))) }}"
77
owner: "{{ item.owner }}"
88
group: "{{ item.group | default(item.owner) }}"
99
mode: "{{ item.mode | default('0600') }}"
@@ -14,7 +14,7 @@
1414

1515
- name: private-keys | remove
1616
ansible.builtin.file:
17-
path: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(ssh_keys_private_key_filename))) }}"
17+
path: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(item.src | basename))) }}"
1818
state: absent
1919
with_items: "{{ ssh_keys_private_keys }}"
2020
when: item.state is defined and item.state == 'absent'

tasks/public-keys.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- name: public-keys | add
44
ansible.builtin.copy:
55
src: "{{ item.src }}"
6-
dest: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(ssh_keys_public_key_filename))) }}"
6+
dest: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(item.src | basename))) }}"
77
owner: "{{ item.owner }}"
88
group: "{{ item.group | default(item.owner) }}"
99
mode: "{{ item.mode | default('0644') }}"
@@ -14,7 +14,7 @@
1414

1515
- name: public-keys | remove
1616
ansible.builtin.file:
17-
path: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(ssh_keys_public_key_filename))) }}"
17+
path: "{{ item.dest_absolute | default('~' + item.owner + '/' + ssh_keys_sshdir + '/' + (item.dest | default(item.src | basename))) }}"
1818
state: absent
1919
with_items: "{{ ssh_keys_public_keys }}"
2020
when: item.state is defined and item.state == 'absent'

vars/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# vars file
22
---
33
ssh_keys_sshdir: '.ssh'
4-
ssh_keys_private_key_filename: 'id_rsa'
5-
ssh_keys_public_key_filename: 'id_rsa.pub'
64
ssh_keys_known_hosts_path: /etc/ssh/ssh_known_hosts
75
_ssh_keys_generate_keys_command: >-
86
openssl \

0 commit comments

Comments
 (0)