From d91a54287c0b157979add905a6202554aa34e093 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 30 Nov 2018 22:36:19 +0100 Subject: [PATCH] nicer template to generate authorized keys for openwrt --- ansible/group_vars/accesspoints/main.yml | 5 +---- ansible/host_vars/torwaechter/main.yml | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ansible/group_vars/accesspoints/main.yml b/ansible/group_vars/accesspoints/main.yml index 51cd80a..7147bbd 100644 --- a/ansible/group_vars/accesspoints/main.yml +++ b/ansible/group_vars/accesspoints/main.yml @@ -145,10 +145,7 @@ openwrt_mixin: net.ipv6.conf.all.forwarding=0 /etc/dropbear/authorized_keys: - content: |- - {% for key in ssh_users_root | user_ssh_keys(users) %} - {{ key }} - {% endfor %} + content: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}\n" /etc/htoprc: file: "{{ global_files_dir }}/common/htoprc" diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml index 75e16de..85a516f 100644 --- a/ansible/host_vars/torwaechter/main.yml +++ b/ansible/host_vars/torwaechter/main.yml @@ -60,16 +60,10 @@ openwrt_mixin: AuthorizedKeysCommandUser tuergit /etc/ssh/authorized_keys.d/root: - content: |- - {% for key in ssh_users_root | user_ssh_keys(users) %} - {{ key }} - {% endfor %} + content: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}\n" /etc/ssh/authorized_keys.d/tuergit: - content: |- - {% for key in ssh_users_tuergit | user_ssh_keys(users) %} - {{ key }} - {% endfor %} + content: "{{ ssh_users_tuergit | user_ssh_keys(users) | join('\n') }}\n" openwrt_uci: system: -- 1.7.10.4