From afcf5315881caf650228f6e2bdd21832a89bfa06 Mon Sep 17 00:00:00 2001 From: cruizba Date: Fri, 26 Sep 2025 14:23:05 +0200 Subject: [PATCH] Revert "Add MEET_BASE_URL" This reverts commit 8e644bddb89d6588f27dacb7355fee1ac8ef7bb9. --- community/scripts/entrypoint_openvidu_meet.sh | 9 ++------ community/scripts/utils.sh | 22 ++++--------------- pro/scripts/entrypoint_openvidu_meet.sh | 6 ++--- pro/scripts/utils.sh | 22 ++++--------------- 4 files changed, 12 insertions(+), 47 deletions(-) diff --git a/community/scripts/entrypoint_openvidu_meet.sh b/community/scripts/entrypoint_openvidu_meet.sh index 7a83d88..46bf316 100644 --- a/community/scripts/entrypoint_openvidu_meet.sh +++ b/community/scripts/entrypoint_openvidu_meet.sh @@ -2,12 +2,7 @@ . /scripts/utils.sh -LIVEKIT_URL=$(getDeploymentUrl ws) -MEET_BASE_URL=$(getDeploymentUrl http meet) -export LIVEKIT_URL="${LIVEKIT_URL}" -export MEET_BASE_URL="${MEET_BASE_URL}" - -echo "LIVEKIT_URL is set to ${LIVEKIT_URL}" -echo "MEET_BASE_URL is set to ${MEET_BASE_URL}" +URL=$(getDeploymentUrl ws) +export LIVEKIT_URL="${URL}" /usr/local/bin/entrypoint.sh diff --git a/community/scripts/utils.sh b/community/scripts/utils.sh index ae83053..206efa0 100644 --- a/community/scripts/utils.sh +++ b/community/scripts/utils.sh @@ -2,31 +2,17 @@ getDeploymentUrl() { schema="${1:-http}" - service="${2:-default}" - - if [ "$service" = "meet" ]; then - URL="$schema://localhost:9080" - if [ "${USE_HTTPS}" = 'true' ]; then - URL="${schema}s://localhost:9443" - fi - else - URL="$schema://localhost:7880" - if [ "${USE_HTTPS}" = 'true' ]; then - URL="${schema}s://localhost:7443" - fi + URL="$schema://localhost:7880" + if [ "${USE_HTTPS}" = 'true' ]; then + URL="${schema}s://localhost:7443" fi - if [ "${LAN_MODE}" = 'true' ]; then LAN_DOMAIN=${LAN_DOMAIN:-"openvidu-local.dev"} if [ "$LAN_PRIVATE_IP" != 'none' ] && [ "${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then # Replace dots with dashes LAN_DOMAIN="$(echo "$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev" fi - if [ "$service" = "meet" ]; then - URL="${schema}s://${LAN_DOMAIN}:9443" - else - URL="${schema}s://${LAN_DOMAIN}:7443" - fi + URL="${schema}s://${LAN_DOMAIN}:7443" fi echo "$URL" } diff --git a/pro/scripts/entrypoint_openvidu_meet.sh b/pro/scripts/entrypoint_openvidu_meet.sh index d48499c..46bf316 100644 --- a/pro/scripts/entrypoint_openvidu_meet.sh +++ b/pro/scripts/entrypoint_openvidu_meet.sh @@ -2,9 +2,7 @@ . /scripts/utils.sh -LIVEKIT_URL=$(getDeploymentUrl ws) -MEET_BASE_URL=$(getDeploymentUrl http meet) -export LIVEKIT_URL="${LIVEKIT_URL}" -export MEET_BASE_URL="${MEET_BASE_URL}" +URL=$(getDeploymentUrl ws) +export LIVEKIT_URL="${URL}" /usr/local/bin/entrypoint.sh diff --git a/pro/scripts/utils.sh b/pro/scripts/utils.sh index ae83053..206efa0 100644 --- a/pro/scripts/utils.sh +++ b/pro/scripts/utils.sh @@ -2,31 +2,17 @@ getDeploymentUrl() { schema="${1:-http}" - service="${2:-default}" - - if [ "$service" = "meet" ]; then - URL="$schema://localhost:9080" - if [ "${USE_HTTPS}" = 'true' ]; then - URL="${schema}s://localhost:9443" - fi - else - URL="$schema://localhost:7880" - if [ "${USE_HTTPS}" = 'true' ]; then - URL="${schema}s://localhost:7443" - fi + URL="$schema://localhost:7880" + if [ "${USE_HTTPS}" = 'true' ]; then + URL="${schema}s://localhost:7443" fi - if [ "${LAN_MODE}" = 'true' ]; then LAN_DOMAIN=${LAN_DOMAIN:-"openvidu-local.dev"} if [ "$LAN_PRIVATE_IP" != 'none' ] && [ "${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then # Replace dots with dashes LAN_DOMAIN="$(echo "$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev" fi - if [ "$service" = "meet" ]; then - URL="${schema}s://${LAN_DOMAIN}:9443" - else - URL="${schema}s://${LAN_DOMAIN}:7443" - fi + URL="${schema}s://${LAN_DOMAIN}:7443" fi echo "$URL" }