X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Fhost_vars%2Ftorwaechter%2Fmain.yml;h=9e9e990a2bc6bfdaca93d9e36c899dd73847bcb0;hb=8dc3a5dc03d40bd0b5100377598d8def6392d4bf;hp=768a04040d3964282efdb3ac9e09a23e3461e0c0;hpb=eeae6781756948b62b236850b4bb37e8c8f95fea;p=noc.git

diff --git a/ansible/host_vars/torwaechter/main.yml b/ansible/host_vars/torwaechter/main.yml
index 768a040..9e9e990 100644
--- a/ansible/host_vars/torwaechter/main.yml
+++ b/ansible/host_vars/torwaechter/main.yml
@@ -24,16 +24,10 @@ openwrt_packages_extra:
   - lsblk
 
 openwrt_mixin:
-  /etc/default:
-    dirname:
-  /etc/hotplug.d/tty/:
-    dirname:
-  /etc/hotplug.d/usb/:
-    dirname:
   /home:
-    dirname:
+    directory:
   /run:
-    dirname:
+    link: "/var/run"
 
   # Go binaries
   /usr/local/bin/door_client:
@@ -47,20 +41,22 @@ openwrt_mixin:
     file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/update-keys/update-keys"
 
   # door daemon init scripts and configs
-  /etc/init.d/tuer_core:
+  /etc/init.d/doord:
     mode: '0755'
-    file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/initscripts/tuer_core.openwrt"
-  /etc/default/tuer:
+    file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/initscripts/doord.openwrt"
+  /etc/default/door:
     mode: '0755'
-    file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/initscripts/tuer.default"
-  /etc/rc.d/S50tuer_core:
-    link: "../init.d/tuer_core"
+    file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/initscripts/door.default"
+  /etc/default/tuer:
+    link: "./door"
+  /etc/rc.d/S50doord:
+    link: "../init.d/doord"
 
   # hotplug files
   /etc/hotplug.d/tty/door.tty:
     mode: '0755'
     file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/scripts/door.tty"
-  /etc/hotplug.d/tty/door.usb:
+  /etc/hotplug.d/usb/door.usb:
     mode: '0755'
     file: "{{ global_cache_dir }}/{{ inventory_hostname }}/door_and_sensors/scripts/door.usb"
 
@@ -142,6 +138,7 @@ openwrt_uci:
         dns_search: realraum.at
 
 
+# does not work, using symlink to /var/run instead for now
 openwrt_mounts:
   - path: /run
     src: none