Support optional licence when recording (plus bits)

pljones · Sep 28, 2021 · 2554a38 · 2554a38
1 parent 78691ba
commit 2554a38
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 17 deletions.
diff --git a/run-Jamulus-template.sh b/run-Jamulus-template.sh
@@ -10,7 +10,7 @@ JAMULUS_OPTS=("-n" "-s")
 if [ ! -z "$JAMULUS_PORT" ] ; then JAMULUS_OPTS+=("-p" $JAMULUS_PORT); fi
 if [ ! -z "$JAMULUS_QOS" ] ; then JAMULUS_OPTS+=("-Q" $JAMULUS_QOS); fi
 if [ ! -z "$JAMULUS_DISCONNECT" ] && $JAMULUS_DISCONNECT; then JAMULUS_OPTS+=("-d"); fi
-if [ ! -z "$JAMULUS_CENTRAL" ] ; then JAMULUS_OPTS+=("-e" "$JAMULUS_CENTRAL"); fi
+if [ ! -z "$JAMULUS_DIRECTORY" ] ; then JAMULUS_OPTS+=("-e" "$JAMULUS_DIRECTORY"); fi
 if [ ! -z "$JAMULUS_DIRECTORYFILE" ] ; then JAMULUS_OPTS+=("--directoryfile" "$JAMULUS_DIRECTORYFILE"); fi
 if [ ! -z "$JAMULUS_FILTER" ] ; then JAMULUS_OPTS+=("-f" "$JAMULUS_FILTER"); fi
 if [ ! -z "$JAMULUS_FASTUPDATE" ] && $JAMULUS_FASTUPDATE; then JAMULUS_OPTS+=("-F"); fi
@@ -27,7 +27,8 @@ if [ ! -z "$JAMULUS_DELAYPAN" ] && $JAMULUS_DELAYPAN; then JAMULUS_OPTS+=("-P");
 
 if [ ! -z "$JAMULUS_ENABLE_RECORDING" ] && $JAMULUS_ENABLE_RECORDING && [ ! -z "$JAMULUS_RECORDING_DIR" ]
 then
-	JAMULUS_OPTS+=("-L" "-R" "$JAMULUS_RECORDING_DIR")
+	JAMULUS_OPTS+=("-R" "$JAMULUS_RECORDING_DIR")
+	if [ ! -z "$JAMULUS_WELCOMEMSG" ] ; then JAMULUS_OPTS+=("-L"); fi
 fi
 
 if [ ! -z "$JAMULUS_MULTITHREADED" ] && $JAMULUS_MULTITHREADED; then JAMULUS_OPTS+=("-T"); fi

diff --git a/systemd-Central1.env b/systemd-Central1.env
@@ -7,9 +7,9 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22124
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 #JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central1.persistence
-#JAMULUS_FILTER=[3.6.1]
+JAMULUS_FILTER=[3.8.0]
 #JAMULUS_STATUSPAGE=
 #JAMULUS_SERVERNAME='Jamulus-Directory 1'
 JAMULUS_LOGFILE=/opt/Jamulus/log/Central1.log

diff --git a/systemd-Central2.env b/systemd-Central2.env
@@ -7,9 +7,9 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22224
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central2.persistence
-#JAMULUS_FILTER=[3.6.1]
+JAMULUS_FILTER=[3.8.0]
 #JAMULUS_STATUSPAGE=
 #JAMULUS_SERVERNAME='Jamulus-Directory 2'
 JAMULUS_LOGFILE=/opt/Jamulus/log/Central2.log

diff --git a/systemd-Central3.env b/systemd-Central3.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22324
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central3.persistence
 #JAMULUS_FILTER=[3.6.1] ;# Leaving this alone for now
 #JAMULUS_STATUSPAGE=

diff --git a/systemd-Central4.env b/systemd-Central4.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22424
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central4.persistence
 #JAMULUS_FILTER=[3.6.1] ;# Leaving this alone for now
 #JAMULUS_STATUSPAGE=

diff --git a/systemd-Central5.env b/systemd-Central5.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22524
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central5.persistence
 #JAMULUS_FILTER=[3.6.1] ;# Leaving this alone for now
 #JAMULUS_STATUSPAGE=

diff --git a/systemd-Central6.env b/systemd-Central6.env
@@ -7,9 +7,9 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22624
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central6.persistence
-#JAMULUS_FILTER=[3.6.1]
+JAMULUS_FILTER=[3.8.0]
 #JAMULUS_STATUSPAGE=
 #JAMULUS_SERVERNAME='Jamulus-Directory 6'
 JAMULUS_LOGFILE=/opt/Jamulus/log/Central6.log

diff --git a/systemd-Central7.env b/systemd-Central7.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22724
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central7.persistence
 JAMULUS_FILTER=[3.6.1]
 #JAMULUS_STATUSPAGE=

diff --git a/systemd-Central8.env b/systemd-Central8.env
@@ -7,9 +7,9 @@ JAMULUS_MAXCHANS=1
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=22824
-JAMULUS_CENTRAL=localhost
+JAMULUS_DIRECTORY=localhost
 JAMULUS_DIRECTORYFILE=/opt/Jamulus/run/Central8.persistence
-JAMULUS_FILTER=[3.6.1]
+JAMULUS_FILTER=[3.8.0]
 #JAMULUS_STATUSPAGE=
 #JAMULUS_SERVERNAME='Jamulus-Directory 8'
 JAMULUS_LOGFILE=/opt/Jamulus/log/Central8.log

diff --git a/systemd-server.env b/systemd-server.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=50
 #JAMULUS_IPV6=false
 #JAMULUS_PUBLICIP=
 JAMULUS_PORT=54850
-JAMULUS_CENTRAL=anygenre2.jamulus.io:22224
+JAMULUS_DIRECTORY=anygenre2.jamulus.io:22224
 #JAMULUS_FILTER=
 JAMULUS_STATUSPAGE=/opt/Jamulus/run/status.html
 JAMULUS_SERVERNAME=jamulus.drealm.info

diff --git a/systemd-wip.env b/systemd-wip.env
@@ -7,7 +7,7 @@ JAMULUS_MAXCHANS=50
 #JAMULUS_IPV6=true
 JAMULUS_PUBLICIP="81.174.155.168"
 JAMULUS_PORT=56850
-JAMULUS_CENTRAL="jamulusdirectory8.drealm.info:22824"
+JAMULUS_DIRECTORY="jamulusdirectory8.drealm.info:22824"
 #JAMULUS_FILTER=
 #JAMULUS_STATUSPAGE=
 #JAMULUS_SERVERNAME="drealm.info Test Server (ext 21124)"

diff --git a/[email protected] b/[email protected]
@@ -12,7 +12,7 @@ JAMULUS_MULTITHREADED=false
 JAMULUS_MAXCHANS=
 JAMULUS_PUBLICIP=
 JAMULUS_PORT=
-JAMULUS_CENTRAL=
+JAMULUS_DIRECTORY=
 JAMULUS_FILTER=
 JAMULUS_STATUSPAGE=
 JAMULUS_SERVERNAME=