From a31ed367dd270b04f2534856ba50da748078d2f0 Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Wed, 3 Jul 2024 21:50:43 +0200 Subject: [PATCH 1/3] common: Include the name of the user in authorized_keys --- common.yaml | 1 + roles/common-bitlair/templates/authorized_keys.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/common.yaml b/common.yaml index 2f2247e..755110a 100644 --- a/common.yaml +++ b/common.yaml @@ -2,3 +2,4 @@ - hosts: debian roles: - common + - common-bitlair diff --git a/roles/common-bitlair/templates/authorized_keys.j2 b/roles/common-bitlair/templates/authorized_keys.j2 index f310024..182dc36 100644 --- a/roles/common-bitlair/templates/authorized_keys.j2 +++ b/roles/common-bitlair/templates/authorized_keys.j2 @@ -1,5 +1,6 @@ # Managed by Ansible {% for name in root_access %} +# {{ name }} {{ lookup('file', 'authorized_keys/'+name+'.keys') }} {% endfor %} From 0f86386d6ed2d0ae4a5ae1c2bc19c3736c72393c Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Wed, 3 Jul 2024 21:52:34 +0200 Subject: [PATCH 2/3] Add www playbook --- www.yaml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 www.yaml diff --git a/www.yaml b/www.yaml new file mode 100644 index 0000000..4ee6399 --- /dev/null +++ b/www.yaml @@ -0,0 +1,7 @@ +--- +- hosts: wiki + roles: + - common + - common-bitlair + - acme + - www From b9861ccc8e20309f25304fd42f72d09b82729dfc Mon Sep 17 00:00:00 2001 From: polyfloyd Date: Wed, 3 Jul 2024 21:53:01 +0200 Subject: [PATCH 3/3] hosts: Update kvm host --- hosts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts.yaml b/hosts.yaml index 0dfe49b..c481f7d 100644 --- a/hosts.yaml +++ b/hosts.yaml @@ -5,7 +5,7 @@ all: bank-pi.bitlair.nl: kvm: hosts: - kvm3.bitlair.nl: + kvm4.bitlair.nl: debian: children: bank: