From 93bd1ce2eed7e9cdc27b990fe2b977985f0b6a89 Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 21 Feb 2023 13:28:22 +0100 Subject: [PATCH] talk - improve a few things Signed-off-by: Simon L --- Containers/talk/start.sh | 16 ---------------- php/containers.json | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Containers/talk/start.sh b/Containers/talk/start.sh index 3b7567af..a315c4ac 100644 --- a/Containers/talk/start.sh +++ b/Containers/talk/start.sh @@ -7,9 +7,6 @@ if [ -z "$NC_DOMAIN" ]; then elif [ -z "$TURN_SECRET" ]; then echo "You need to provide the TURN_SECRET." exit 1 -elif [ -z "$JANUS_API_KEY" ]; then - echo "You need to provide the JANUS_API_KEY." - exit 1 elif [ -z "$SIGNALING_SECRET" ]; then echo "You need to provide the SIGNALING_SECRET." exit 1 @@ -36,14 +33,6 @@ TURN_CONF # Janus set -x -sed -i "s|#turn_rest_api_key.*|turn_rest_api_key = \"$JANUS_API_KEY\"|" /etc/janus/janus.jcfg -sed -i "s|#full_trickle.*|full_trickle = true|g" /etc/janus/janus.jcfg -sed -i 's|#stun_server.*|stun_server = "127.0.0.1"|g' /etc/janus/janus.jcfg -sed -i "s|#stun_port.*|stun_port = $TALK_PORT|g" /etc/janus/janus.jcfg -sed -i "s|#turn_port.*|turn_port = $TALK_PORT|g" /etc/janus/janus.jcfg -sed -i 's|#turn_server.*|turn_server = "127.0.0.1"|g' /etc/janus/janus.jcfg -sed -i 's|#turn_type .*|turn_type = "udp"|g' /etc/janus/janus.jcfg -sed -i 's|#ice_ignore_list .*|ice_ignore_list = "udp"|g' /etc/janus/janus.jcfg sed -i 's|#interface.*|interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg sed -i 's|#ws_interface.*|ws_interface = "lo"|g' /etc/janus/janus.transport.websockets.jcfg sed -i 's|certfile =|#certfile =|g' /etc/janus/janus.transport.mqtt.jcfg @@ -81,11 +70,6 @@ url = nats://127.0.0.1:4222 [mcu] type = janus url = ws://127.0.0.1:8188 - -[turn] -apikey = ${JANUS_API_KEY} -secret = ${TURN_SECRET} -servers = turn:$NC_DOMAIN:$TALK_PORT?transport=tcp,turn:$NC_DOMAIN:$TALK_PORT?transport=udp SIGNALING_CONF exec "$@" diff --git a/php/containers.json b/php/containers.json index 1fc53acb..154c8bb1 100644 --- a/php/containers.json +++ b/php/containers.json @@ -240,14 +240,12 @@ "NC_DOMAIN=%NC_DOMAIN%", "TURN_SECRET=%TURN_SECRET%", "SIGNALING_SECRET=%SIGNALING_SECRET%", - "JANUS_API_KEY=%JANUS_API_KEY%", "TZ=%TIMEZONE%", "TALK_PORT=%TALK_PORT%" ], "secrets": [ "TURN_SECRET", - "SIGNALING_SECRET", - "JANUS_API_KEY" + "SIGNALING_SECRET" ], "restart": "unless-stopped" },