X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fhost_vars%2Ftorwaechter%2Fmain.yml;h=cc5a15caa787e475d434b0c968e3882adc104026;hb=b607f45d9168c44a7a04c1d019bced60f0203cf7;hp=016ec44b02d91d25442cbbbc8e93f18db911c12c;hpb=ca8b4fa48837034ffb13a02de8f89d350da4896d;p=noc.git

diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index 016ec44..cc5a15c 100644
--- a/ansible/host_vars/torwaechter/main.yml
+++ b/ansible/host_vars/torwaechter/main.yml
@@ -1,9 +1,13 @@
 ---
+ssh_users_tuergit: "{{ user_groups.noc | union(['fgenesis']) }}"
+
+openwrt_variant: openwrt
+openwrt_release: 18.06.4
 openwrt_arch: x86
 openwrt_target: geode
 openwrt_output_image_suffixes:
   - combined-ext4.img.gz
-  - combined-squashfs.img
+  - combined-squashfs.img.gz
 
 openwrt_packages_extra:
   - "-dropbear"
@@ -58,16 +62,10 @@ openwrt_mixin:
         AuthorizedKeysCommandUser tuergit
 
   /etc/ssh/authorized_keys.d/root:
-    content: |-
-      {% for key in noc_ssh_keys %}
-      {{ key }}
-      {% endfor %}
+    content: "{{ ssh_users_root | user_ssh_keys(users) | join('\n') }}\n"
 
   /etc/ssh/authorized_keys.d/tuergit:
-    content: |-
-      {% for key in noc_ssh_keys %}
-      {{ key }}
-      {% endfor %}
+    content: "{{ ssh_users_tuergit | user_ssh_keys(users) | join('\n') }}\n"
 
 openwrt_uci:
   system: