roles/openwrt-image: Refactor openwrt-mixins

[noc.git] / ansible / tuer.yml

diff --git a/ansible/tuer.yml b/ansible/tuer.yml
index a55e085..9989e0d 100644 (file)
--- a/ansible/tuer.yml
+++ b/ansible/tuer.yml
@@ -1,3 +1,4 @@
+---
 - hosts: torwaechter
   connection: local
   pre_tasks:
@@ -42,6 +43,9 @@
       vars:
         openwrt_arch: x86
         openwrt_target: geode
+        openwrt_output_image_suffixes:
+          - combined-ext4.img.gz
+          - combined-squashfs.img
         openwrt_packages_remove:
           - ppp
           - ppp-mod-pppoe
@@ -61,40 +65,45 @@
           - git
 
         openwrt_mixin:
-          files:
-            # Go binaries
-            /usr/local/bin/door_client: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_client/door_client"
-            /usr/local/bin/door_daemon: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_daemon/door_daemon"
-            /usr/local/bin/update-keys: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/update-keys/update-keys"
+          # Go binaries
+          /usr/local/bin/door_client:
+            file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_client/door_client"
+          /usr/local/bin/door_daemon:
+            file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_daemon/door_daemon"
+          /usr/local/bin/update-keys:
+            file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/update-keys/update-keys"
 
-          content:
-            /etc/config/network: |
+          /etc/config/network:
+            content: |
               config interface 'loopback'
                option ifname 'lo'
                option proto 'static'
                option ipaddr '127.0.0.1'
                option netmask '255.0.0.0'
-              
+
               config globals 'globals'
                option ula_prefix 'fdc9:e01f:83db::/48'
-              
+
               config interface 'lan'
                option ifname 'eth0'
                option accept_ra '0'
                option proto 'static'
-                option ipaddr  '192.168.33.7'
-                option netmask '255.255.255.0'
-                option gateway '192.168.33.1'
-                option dns     '192.168.33.1'
-                option dns_search 'realraum.at'
+               option ipaddr  '192.168.33.7'
+               option netmask '255.255.255.0'
+               option gateway '192.168.33.1'
+               option dns     '192.168.33.1'
+               option dns_search 'realraum.at'
 
-            /etc/config/dropbear: |
+          /etc/config/dropbear:
+            content: |
               config dropbear
-               option PasswordAuth 'on'
+               option PasswordAuth 'off'
                option RootPasswordAuth 'off'
                option Port '22000'
 
-            /etc/dropbear/authorized_keys: |-
+          # TODO: mode needs to be 0600
+          /etc/dropbear/authorized_keys:
+            content: |-
               {% for key in noc_ssh_keys %}
-              key
+              {{ key }}
               {% endfor %}