From 5a2e200abcad4b0710581e10c17edb254dad6ffd Mon Sep 17 00:00:00 2001 From: "andreas.holzmann" Date: Thu, 10 Jul 2025 21:02:35 +0200 Subject: [PATCH] update coturn url and key --- setup.sh | 20 ++++++++++++-------- terraform/main.tf | 2 +- terraform/variables.tf | 10 +++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/setup.sh b/setup.sh index e2681cc..b6347e0 100644 --- a/setup.sh +++ b/setup.sh @@ -35,14 +35,12 @@ else KEYCLOAK_ADMIN_PW=$(date +%s | sha256sum | base64 | head -c 32) NEW_UUID=$(date +%s | sha256sum | base64 | head -c 32) LIVEKIT_KEY=$(date +%s | sha256sum | base64 | head -c 32) - COTURN_KEY=$(date +%s | sha256sum | base64 | head -c 32) echo "KEYCLOAK_PW=$KEYCLOAK_PW" >> $FILE echo "JITSI_ADMIN_PW=$JITSI_ADMIN_PW" >> $FILE echo "MERCURE_JWT_SECRET=$MERCURE_JWT_SECRET" >> $FILE echo "KEYCLOAK_ADMIN_PW=$KEYCLOAK_ADMIN_PW" >> $FILE echo "NEW_UUID=$NEW_UUID" >> $FILE echo "LIVEKIT_KEY=$LIVEKIT_KEY" >> $FILE - echo "COTURN_KEY=$COTURN_KEY" >> $FILE source $FILE fi @@ -77,11 +75,17 @@ fi sed -i '/LIVEKIT_URL/d' $FILE echo "LIVEKIT_URL=$LIVEKIT_URL" >> $FILE - TURN_URL=${TURN_URL:=""} - read -p "Enter the Domain for your Turn Server (Empty if no Coturn setup) [$TURN_URL]: " input - TURN_URL=${input:=$TURN_URL} - sed -i '/TURN_URL/d' $FILE - echo "TURN_URL=$TURN_URL" >> $FILE + COTURN_URL=${COTURN_URL:=""} + read -p "Enter the Domain for your Turn Server (Empty if no Coturn setup) [$COTURN_URL]: " input + COTURN_URL=${input:=$COTURN_URL} + sed -i '/COTURN_URL/d' $FILE + echo "COTURN_URL=$COTURN_URL" >> $FILE + + COTURN_KEY=${COTURN_KEY:=""} + read -p "Enter the Coturn Secret Key [$COTURN_KEY]: " input + COTURN_KEY=${input:=$COTURN_KEY} + sed -i '/COTURN_KEY/d' $FILE + echo "COTURN_KEY=$COTURN_KEY" >> $FILE fi default_language=${default_language:=en} @@ -185,7 +189,7 @@ if [ "$ENVIRONMENT" = "livekit" ]; then if [ -z "$COTURN_KEY" ]; then sed -i '/turn_servers:/,/^ *credential: /d' livekit/livekit.yaml else - sed -i "s||$TURN_URL|g" livekit/livekit.yaml + sed -i "s||$COTURN_URL|g" livekit/livekit.yaml sed -i "s||$COTURN_KEY|g" livekit/livekit.yaml fi diff --git a/terraform/main.tf b/terraform/main.tf index a65d6a2..be411c8 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -33,7 +33,7 @@ resource "aws_instance" "docker_host" { "sudo /home/ubuntu/install_docker.sh", "chmod +x /home/ubuntu/setup.sh", "sed -i '/^\s*read\b/ s/^/#/' /home/ubuntu/setup.sh", - "sudo VERSION=${var.version} ENVIRONMENT=${var.environment} HTTP_METHOD=${var.http_method} PUBLIC_URL=${var.public_url} default_language=${var.default_language} DOCKER_VOLUME_OWNER=${var.docker_volume_owner} /home/ubuntu/setup.sh" + "sudo VERSION=${var.version} ENVIRONMENT=${var.environment} HTTP_METHOD=${var.http_method} PUBLIC_URL=${var.public_url} default_language=${var.default_language} DOCKER_VOLUME_OWNER=${var.docker_volume_owner} COTRUN_KEY=${var.coturn_key} COTURN_DOMAIN=${var.coturn_domain} /home/ubuntu/setup.sh" ] connection { diff --git a/terraform/variables.tf b/terraform/variables.tf index 13c8d09..4571587 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -3,7 +3,7 @@ variable "version" { } variable "environment" { - default = "prod" + default = "livekit" } variable "http_method" { @@ -21,3 +21,11 @@ variable "default_language" { variable "docker_volume_owner" { default = "nobody" } + +variable "cotrun_key" { + default = "secure_coturn_key" +} + +variable "cotrun_domain" { + default = "coturn.domain.de" +} \ No newline at end of file