X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fhost_vars%2Ftorwaechter%2Fmain.yml;h=7a0988e3e629b8bd724715c608e6095fc1fa1d43;hb=b0c06fc1f9f80b3b5704688a4e1f5c9e10eadc3a;hp=926b903aab769a4bdc0d64a762ea98e721696744;hpb=23867d487ab86bf9feb0817c365698c051abc213;p=noc.git

diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index 926b903..7a0988e 100644
--- a/ansible/host_vars/torwaechter/main.yml
+++ b/ansible/host_vars/torwaechter/main.yml
@@ -1,12 +1,17 @@
 ---
+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"
+  - hwclock
   - flashrom
   - git
   - kmod-usb-acm
@@ -15,6 +20,8 @@ openwrt_packages_extra:
   - screen
   - sudo
   - usbutils
+  - rsync
+  - lsblk
 
 openwrt_mixin:
   # Go binaries
@@ -30,11 +37,11 @@ openwrt_mixin:
 
   /usr/local/bin/authorized_keys.sh:
     mode: '0755'
-    file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
+    file: "{{ global_files_dir }}/{{ inventory_hostname }}/authorized_keys.sh"
 
   /usr/local/bin/update-keys-from-stdin.sh:
     mode: '0755'
-    file: "{{ global_artifacts_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
+    file: "{{ global_files_dir }}/{{ inventory_hostname }}/update-keys-from-stdin.sh"
 
   /etc/ssh/sshd_config:
     content: |
@@ -57,16 +64,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: