X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Ftuer.yml;h=1ed9f12c8f2ec1ceb332be6512918e20fda7614b;hb=4582c57b9fe0d77f0997c08f471a1ae38c52377f;hp=c73b047ad8d87d71b7b9a59eaaed3e4beca21a7c;hpb=4649fe7abd60b492916e07f614f85378c433b433;p=noc.git

diff --git a/ansible/tuer.yml b/ansible/tuer.yml
index c73b047..1ed9f12 100644
--- a/ansible/tuer.yml
+++ b/ansible/tuer.yml
@@ -43,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
@@ -62,40 +65,48 @@
           - 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:
+            mode: 0755
+            file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_client/door_client"
+          /usr/local/bin/door_daemon:
+            mode: 0755
+            file: "{{ playbook_dir }}/.cache/openwrt/tuer/door_and_sensors/door_daemon/door_daemon"
+          /usr/local/bin/update-keys:
+            mode: 0755
+            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: |-
+          /etc/dropbear/authorized_keys:
+            mode: 0600
+            content: |-
               {% for key in noc_ssh_keys %}
-              key
+              {{ key }}
               {% endfor %}