From 94e31bbbd88f9bd3711819ac59220c13b7a32242 Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Wed, 14 Apr 2021 19:01:41 +0100
Subject: [PATCH 1/2] Use exec when starting process via the shell.

This fixes the signal handling issue with systemctl reported in #1515,
but still allows shell substitution of environment variables.
---
 distributions/debian/jamulus-headless.service | 2 +-
 distributions/jamulus-server.service          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distributions/debian/jamulus-headless.service b/distributions/debian/jamulus-headless.service
index 5cc93eeac9..8cf975d8b3 100644
--- a/distributions/debian/jamulus-headless.service
+++ b/distributions/debian/jamulus-headless.service
@@ -16,7 +16,7 @@ IOSchedulingPriority=0
 
 #### Change this to publish this server, set genre, location and other parameters.
 #### See https://jamulus.io/wiki/Command-Line-Options ####
-ExecStart=/bin/sh -c '/usr/bin/jamulus-headless -s -n'
+ExecStart=/bin/sh -c 'exec /usr/bin/jamulus-headless -s -n'
 
 
 Restart=on-failure
diff --git a/distributions/jamulus-server.service b/distributions/jamulus-server.service
index e3b281418c..85a1089cda 100644
--- a/distributions/jamulus-server.service
+++ b/distributions/jamulus-server.service
@@ -8,7 +8,7 @@ Type=simple
 Restart=always
 RestartSec=1
 User=jamulus
-ExecStart=/bin/sh -c '/usr/bin/jamulus -s -n -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
+ExecStart=/bin/sh -c 'exec /usr/bin/jamulus -s -n -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
 
 [Install]
 WantedBy=multi-user.target

From 1ca97f541da423c3d75f5f989aecf06ab742cfcc Mon Sep 17 00:00:00 2001
From: Tony Mountifield <tony@mountifield.org>
Date: Wed, 14 Apr 2021 21:05:52 +0100
Subject: [PATCH 2/2] Use jamulus.io instead of fischvolk.de

Uses anygenre3.jamulus.io as an example, because that server is less used.
---
 distributions/jamulus-server.service | 2 +-
 distributions/raspijamulus.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distributions/jamulus-server.service b/distributions/jamulus-server.service
index 85a1089cda..dc30d4cc12 100644
--- a/distributions/jamulus-server.service
+++ b/distributions/jamulus-server.service
@@ -8,7 +8,7 @@ Type=simple
 Restart=always
 RestartSec=1
 User=jamulus
-ExecStart=/bin/sh -c 'exec /usr/bin/jamulus -s -n -l /var/log/jamulus -e jamulus.fischvolk.de -g -o "$(uname -n);;"'
+ExecStart=/bin/sh -c 'exec /usr/bin/jamulus -s -n -l /var/log/jamulus -e anygenre3.jamulus.io -g -o "$(uname -n);;"'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh
index f4a1be07c0..e277b521f2 100755
--- a/distributions/raspijamulus.sh
+++ b/distributions/raspijamulus.sh
@@ -108,7 +108,7 @@ fi
 # start Jack2 and Jamulus in headless mode
 export LD_LIBRARY_PATH="distributions/${OPUS}/.libs:distributions/jack2/build:distributions/jack2/build/common"
 distributions/jack2/build/jackd -R -T --silent -P70 -p16 -t2000 -d alsa -dhw:${ADEVICE} -p 128 -n 3 -r 48000 -s &
-./Jamulus -n -i ${JAMULUSINIFILE} -c jamulus.fischvolk.de &
+./Jamulus -n -i ${JAMULUSINIFILE} -c anygenre3.jamulus.io &
 
 echo "###---------- PRESS ANY KEY TO TERMINATE THE JAMULUS SESSION ---------###"
 read -n 1 -s -r -p ""