X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fhost_vars%2Ftorwaechter%2Fmain.yml;h=ea413700ba04c2d892fef063a04d2c27af714263;hb=2d31a118104afea81e885845bbf139d38b913b9d;hp=f50f8f91e58fc51ecf1a0b2b573825fbca307588;hpb=44a2c82805c1ae901a5cd9f0df9326750f9d9016;p=noc.git

diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index f50f8f9..ea41370 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,8 +20,13 @@ openwrt_packages_extra:
   - screen
   - sudo
   - usbutils
+  - rsync
+  - lsblk
 
 openwrt_mixin:
+  /run:
+    dirname:
+
   # Go binaries
   /usr/local/bin/door_client:
     mode: '0755'
@@ -30,11 +40,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 +67,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:
@@ -100,15 +104,15 @@ openwrt_uci:
         ipaddr: 127.0.0.1
         netmask: 255.0.0.0
 
-    - name: interface 'lan'
+    - name: interface 'mgmt'
       options:
         ifname: eth0
         accept_ra: 0
         proto: static
-        ipaddr: 192.168.32.100
-        netmask: 255.255.255.0
-        gateway: 192.168.32.254
-        dns: 192.168.32.254
+        ipaddr: "{{ net.mgmt.prefix | ipaddr(100) | ipaddr('address') }}"
+        netmask: "{{ net.mgmt.prefix | ipaddr('netmask') }}"
+        gateway: "{{ net.mgmt.gw }}"
+        dns: "{{ net.mgmt.dns | join(' ') }}"
         dns_search: realraum.at