From 9ff9a7901c9fb4e13688f90c4dd1c2e8ce2c9dd4 Mon Sep 17 00:00:00 2001 From: szaimen Date: Fri, 18 Mar 2022 16:41:31 +0100 Subject: [PATCH] fix talk hpb Signed-off-by: szaimen --- Containers/talk/Dockerfile | 7 +++++-- Containers/talk/start.sh | 15 +++++++-------- Containers/talk/supervisord.conf | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index 9f70d7df..180aecaf 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -49,13 +49,16 @@ RUN chmod +x /usr/bin/start.sh; \ sed -i '/TURNSERVER_ENABLED/c\TURNSERVER_ENABLED=1' /etc/default/coturn; \ mkdir -p /var/tmp; +RUN curl -sL -o "/usr/share/janus/lua/json.lua" "https://raw.githubusercontent.com/rxi/json.lua/master/json.lua"; \ + curl -sL -o "/usr/share/janus/lua/ansicolors.lua" "https://raw.githubusercontent.com/kikito/ansicolors.lua/master/ansicolors.lua" + RUN mkdir -p /etc/nats; \ echo "listen: 127.0.0.1:4222" > /etc/nats/nats.conf; \ + chown talk:talk /etc; \ chown talk:talk -R /etc/nats; \ chown talk:talk -R /etc/janus; \ chown talk:talk -R /etc/signaling; \ - chown talk:talk -R /usr/share/janus; \ - cat /etc/janus/janus.jcfg + chown talk:talk -R /usr # Give root a random password RUN echo "root:$(openssl rand -base64 12)" | chpasswd diff --git a/Containers/talk/start.sh b/Containers/talk/start.sh index 0f15c95b..c1a363e8 100644 --- a/Containers/talk/start.sh +++ b/Containers/talk/start.sh @@ -26,7 +26,6 @@ realm=$NC_DOMAIN total-quota=100 bps-capacity=0 stale-nonce -no-loopback-peers no-multicast-peers simple-log pidfile=/var/tmp/turnserver.pid @@ -34,16 +33,16 @@ 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|#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_server.*|stun_server = "127.0.0.1"|g' /etc/janus/janus.jcfg sed -i "s|#stun_port.*|stun_port = 3478|g" /etc/janus/janus.jcfg sed -i "s|#turn_port.*|turn_port = 3478|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|cert_pem|#cert_pem|g" /etc/janus/janus.jcfg -sed -i "s|cert_key|#cert_key|g" /etc/janus/janus.jcfg -sed -i "s|cert_pwd|#cert_pwd|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 set +x # Signling diff --git a/Containers/talk/supervisord.conf b/Containers/talk/supervisord.conf index 7b9a8c74..5e2dcd79 100644 --- a/Containers/talk/supervisord.conf +++ b/Containers/talk/supervisord.conf @@ -27,7 +27,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -command=janus +command=/usr/bin/janus --config=/etc/janus/janus.jcfg --disable-colors --daemon --log-stdout [program:signaling] stdout_logfile=/dev/stdout