From 4b10fcada204c36d64acd354cb8dd7d3076f5ed0 Mon Sep 17 00:00:00 2001 From: szaimen Date: Mon, 24 Oct 2022 21:38:17 +0200 Subject: [PATCH] use the add commands to add talk settings Signed-off-by: szaimen --- Containers/nextcloud/entrypoint.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Containers/nextcloud/entrypoint.sh b/Containers/nextcloud/entrypoint.sh index 9655c0b0..7e2cbea1 100644 --- a/Containers/nextcloud/entrypoint.sh +++ b/Containers/nextcloud/entrypoint.sh @@ -398,12 +398,16 @@ if [ "$TALK_ENABLED" = 'yes' ]; then else php /var/www/html/occ app:update spreed fi - STUN_SERVERS="[\"$NC_DOMAIN:$TALK_PORT\"]" - TURN_SERVERS="[{\"server\":\"$NC_DOMAIN:$TALK_PORT\",\"secret\":\"$TURN_SECRET\",\"protocols\":\"udp,tcp\"}]" - SIGNALING_SERVERS="{\"servers\":[{\"server\":\"https://$NC_DOMAIN/standalone-signaling/\",\"verify\":true}],\"secret\":\"$SIGNALING_SECRET\"}" - php /var/www/html/occ config:app:set spreed stun_servers --value="$STUN_SERVERS" --output json - php /var/www/html/occ config:app:set spreed turn_servers --value="$TURN_SERVERS" --output json - php /var/www/html/occ config:app:set spreed signaling_servers --value="$SIGNALING_SERVERS" --output json + # Based on https://github.com/nextcloud/spreed/issues/960#issuecomment-416993435 + if ! php /var/www/html/occ talk:turn:list --output="plain" | grep -q "$NC_DOMAIN:$TALK_PORT"; then + php /var/www/html/occ talk:turn:add "$NC_DOMAIN:$TALK_PORT" "udp,tcp" --secret="$TURN_SECRET" + fi + if ! php /var/www/html/occ talk:stun:list --output="plain" | grep -q "$NC_DOMAIN:$TALK_PORT"; then + php /var/www/html/occ talk:stun:add "$NC_DOMAIN:$TALK_PORT" + fi + if ! php /var/www/html/occ talk:signaling:list --output="plain" | grep -q "https://$NC_DOMAIN/standalone-signaling/"; then + php /var/www/html/occ talk:signaling:add "https://$NC_DOMAIN/standalone-signaling/" "$SIGNALING_SECRET" --validate-ssh-certificate + fi else if [ -d "/var/www/html/custom_apps/spreed" ]; then php /var/www/html/occ app:remove spreed