From bbc94ce76d5ad397dea8f9816a7c0454cd710296 Mon Sep 17 00:00:00 2001
From: Markus Katharina Brechtel <markus.katharina.brechtel@thengo.net>
Date: Mon, 1 Mar 2021 01:11:18 +0100
Subject: [PATCH] ssh known hosts

---
 users.yaml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/users.yaml b/users.yaml
index 645a465..bbeeee9 100644
--- a/users.yaml
+++ b/users.yaml
@@ -8,19 +8,19 @@
   roles:
     - name: users
 
-# - hosts: desktops:laptops
-#   remote_user: root
-#   tasks:
-#     - name: /etc/ssh/ssh_config
-#       template:
-#         src: ssh_config.j2
-#         dest: /etc/ssh/ssh_config
-#     - name: ssh known hosts
-#       known_hosts:
-#         name: "{{item}}"
-#         key: "{{item}},{{hostvars[item].ansible_default_ipv4.address}} {{hostvars[item].ansible_ssh_host_key_ed25519_public_keytype}} {{hostvars[item].ansible_ssh_host_key_ed25519_public}}"
-#         path: /etc/ssh/ssh_known_hosts
-#       loop: "{{groups.servers}}"
+- hosts: desktops:laptops
+  remote_user: root
+  tasks:
+    - name: /etc/ssh/ssh_config
+      template:
+        src: ssh_config.j2
+        dest: /etc/ssh/ssh_config
+    - name: ssh known hosts
+      known_hosts:
+        name: "{{item}}"
+        key: "{{item}},{{hostvars[item].ansible_all_ipv4_addresses|join(',')}},{{hostvars[item].ansible_all_ipv6_addresses|join(',')}} {{hostvars[item].ansible_ssh_host_key_ed25519_public_keytype}} {{hostvars[item].ansible_ssh_host_key_ed25519_public}}"
+        path: /etc/ssh/ssh_known_hosts
+      loop: "{{groups.servers}}"
 
 - hosts:
     - servers
@@ -34,5 +34,3 @@
       loop: "{{ hostvars | json_query(\"*.user_ssh_keys_info.results[]\") }}"
       loop_control:
         label: "{{ item.name }}"
-      tags:
-        - users