From e42324011666ac22388ceaa9a0937bff0450807c Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 9 Jul 2022 16:44:51 +0200
Subject: dolmetsch-rapsi: fix autorestarting of service units

---
 dan/ele-dolmetsch-raspi.yml                              |  2 +-
 inventory/group_vars/ele-dolmetsch-raspi/vars.yml        |  4 ++++
 roles/slim/raspbian/tasks/main.yml                       | 16 ++++++++++++++++
 .../dolmetsch-raspi/templates/dolmetschctl.service.j2    |  4 ++--
 .../dolmetsch-raspi/templates/dolmetschctld.service.j2   |  4 ++--
 .../dolmetsch-raspi/templates/rtp-recv.service.j2        |  4 ++--
 .../dolmetsch-raspi/templates/rtp-send.service.j2        |  4 ++--
 7 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/dan/ele-dolmetsch-raspi.yml b/dan/ele-dolmetsch-raspi.yml
index 6097cb8d..f75afcf8 100644
--- a/dan/ele-dolmetsch-raspi.yml
+++ b/dan/ele-dolmetsch-raspi.yml
@@ -1,6 +1,6 @@
 ---
 - name: Basic Setup
-  hosts: ele-dolmetsch-raspi
+  hosts: "{{ install_hostname }}"
   roles:
   - role: slim/raspbian
   - role: core/base
diff --git a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
index c3a14d04..bb9cb906 100644
--- a/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
+++ b/inventory/group_vars/ele-dolmetsch-raspi/vars.yml
@@ -1,4 +1,8 @@
 ---
+install_playbook: ele-dolmetsch-raspi
+
+raspbian_disable_audio: false
+
 ssh_users_root:
   - equinox
   - datacop
diff --git a/roles/slim/raspbian/tasks/main.yml b/roles/slim/raspbian/tasks/main.yml
index d943d6aa..39b0c66f 100644
--- a/roles/slim/raspbian/tasks/main.yml
+++ b/roles/slim/raspbian/tasks/main.yml
@@ -1,4 +1,20 @@
 ---
+- name: remove legacy device-tree overlays for rpi3
+  loop:
+  - pi3-disable-wifi
+  - pi3-disable-bt
+  lineinfile:
+    path: /boot/config.txt
+    line: "dtoverlay={{ item }}"
+    state: absent
+
+- name: enable/disable bluetooh
+  lineinfile:
+    path: /boot/config.txt
+    line: dtoverlay=disable-bt
+    insertafter: '^\[all\]'
+    state: "{{ raspbian_disable_bluetooth | ternary('present', 'absent') }}"
+
 - name: enable/disable wifi
   lineinfile:
     path: /boot/config.txt
diff --git a/roles/streaming/dolmetsch-raspi/templates/dolmetschctl.service.j2 b/roles/streaming/dolmetsch-raspi/templates/dolmetschctl.service.j2
index bcf2b784..12207e1d 100644
--- a/roles/streaming/dolmetsch-raspi/templates/dolmetschctl.service.j2
+++ b/roles/streaming/dolmetsch-raspi/templates/dolmetschctl.service.j2
@@ -1,12 +1,12 @@
 [Unit]
 Description=dolmetschctl Client
+StartLimitBurst=10
+StartLimitIntervalSec=5s
 
 [Service]
 ExecStart=/opt/dolmetschctl/dolmetschctl {{ dolmetsch_raspi_server_address }}:8234
 Restart=always
 RestartSecs=1s
-StartLimitBurst=10
-StartLimitIntervalSec=5s
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 NoNewPrivileges=yes
 PrivateTmp=yes
diff --git a/roles/streaming/dolmetsch-raspi/templates/dolmetschctld.service.j2 b/roles/streaming/dolmetsch-raspi/templates/dolmetschctld.service.j2
index fc6e632d..18eb99fd 100644
--- a/roles/streaming/dolmetsch-raspi/templates/dolmetschctld.service.j2
+++ b/roles/streaming/dolmetsch-raspi/templates/dolmetschctld.service.j2
@@ -1,12 +1,12 @@
 [Unit]
 Description=dolmetschctl Server
+StartLimitBurst=10
+StartLimitIntervalSec=5s
 
 [Service]
 ExecStart=/opt/dolmetschctl/dolmetschctld
 Restart=always
 RestartSecs=1s
-StartLimitBurst=10
-StartLimitIntervalSec=5s
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 NoNewPrivileges=yes
 PrivateTmp=yes
diff --git a/roles/streaming/dolmetsch-raspi/templates/rtp-recv.service.j2 b/roles/streaming/dolmetsch-raspi/templates/rtp-recv.service.j2
index be655128..11e66a78 100644
--- a/roles/streaming/dolmetsch-raspi/templates/rtp-recv.service.j2
+++ b/roles/streaming/dolmetsch-raspi/templates/rtp-recv.service.j2
@@ -1,12 +1,12 @@
 [Unit]
 Description=RTP Receiver
+StartLimitBurst=10
+StartLimitIntervalSec=5s
 
 [Service]
 ExecStart=/usr/local/bin/rtp-recv.sh {{ dolmetsch_raspi_client_address }} {{ dolmetsch_raspi_recv_latency }}
 Restart=always
 RestartSecs=1s
-StartLimitBurst=10
-StartLimitIntervalSec=5s
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 NoNewPrivileges=yes
 PrivateTmp=yes
diff --git a/roles/streaming/dolmetsch-raspi/templates/rtp-send.service.j2 b/roles/streaming/dolmetsch-raspi/templates/rtp-send.service.j2
index 090bb80a..0e054008 100644
--- a/roles/streaming/dolmetsch-raspi/templates/rtp-send.service.j2
+++ b/roles/streaming/dolmetsch-raspi/templates/rtp-send.service.j2
@@ -1,12 +1,12 @@
 [Unit]
 Description=RTP Sender
+StartLimitBurst=10
+StartLimitIntervalSec=5s
 
 [Service]
 ExecStart=/usr/local/bin/rtp-send.sh {{ dolmetsch_raspi_server_address }}
 Restart=always
 RestartSecs=1s
-StartLimitBurst=10
-StartLimitIntervalSec=5s
 CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 NoNewPrivileges=yes
 PrivateTmp=yes
-- 
cgit v1.2.3