From f66a78cda75fd9478cfeb35ee557f59d5f48c11d Mon Sep 17 00:00:00 2001 From: cruizba Date: Tue, 16 Jul 2024 20:13:19 +0200 Subject: [PATCH] Add new OpenVidu Call env variables --- community/.env | 7 +++++++ community/docker-compose.yaml | 12 +++++++++++- pro/.env | 7 +++++++ pro/docker-compose.yaml | 12 +++++++++++- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/community/.env b/community/.env index dbd5872..7b355e8 100644 --- a/community/.env +++ b/community/.env @@ -29,3 +29,10 @@ MINIO_SECRET_KEY=minioadmin # Mongo configuration. MONGO_ADMIN_USERNAME=mongoadmin MONGO_ADMIN_PASSWORD=mongoadmin + +# Default App (OpenVidu Call) +CALL_PRIVATE_ACCESS=false +CALL_USER= +CALL_SECRET= +CALL_ADMIN_USER=admin +CALL_ADMIN_SECRET=admin diff --git a/community/docker-compose.yaml b/community/docker-compose.yaml index 5b0fe4b..b655820 100644 --- a/community/docker-compose.yaml +++ b/community/docker-compose.yaml @@ -153,14 +153,24 @@ services: - LAN_DOMAIN=${LAN_DOMAIN:-} - LAN_PRIVATE_IP=${LAN_PRIVATE_IP:-} - SERVER_PORT=6080 + - CALL_NAME_ID=OpenViduCall-LOCAL - LIVEKIT_URL_PRIVATE=ws://openvidu:7880/ - LIVEKIT_API_KEY=${LIVEKIT_API_KEY} - LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET} - - CALL_PRIVATE_ACCESS=DISABLED + - CALL_PRIVATE_ACCESS=${CALL_PRIVATE_ACCESS:-false} - CALL_USER=${CALL_USER:-} - CALL_SECRET=${CALL_SECRET:-} - CALL_ADMIN_SECRET=${CALL_ADMIN_SECRET:-} - CALL_RECORDING=${CALL_RECORDING:-} + - CALL_ADMIN_USER=${CALL_ADMIN_USER:-admin} + - CALL_ADMIN_SECRET=${CALL_ADMIN_SECRET:-admin} + - CALL_LOG_LEVEL=${CALL_LOG_LEVEL:-info} + - CALL_S3_BUCKET=${CALL_S3_BUCKET:-openvidu} + - CALL_S3_SERVICE_ENDPOINT=${CALL_S3_SERVICE_ENDPOINT:-http://minio:9000} + - CALL_S3_ACCESS_KEY=${MINIO_ACCESS_KEY} + - CALL_S3_SECRET_KEY=${MINIO_SECRET_KEY} + - CALL_AWS_REGION=${CALL_AWS_REGION:-us-east-1} + - CALL_S3_WITH_PATH_STYLE_ACCESS=${CALL_S3_WITH_PATH_STYLE_ACCESS:-true} volumes: - ./scripts/entrypoint_default_app.sh:/scripts/entrypoint.sh - ./scripts/utils.sh:/scripts/utils.sh diff --git a/pro/.env b/pro/.env index dbd5872..7b355e8 100644 --- a/pro/.env +++ b/pro/.env @@ -29,3 +29,10 @@ MINIO_SECRET_KEY=minioadmin # Mongo configuration. MONGO_ADMIN_USERNAME=mongoadmin MONGO_ADMIN_PASSWORD=mongoadmin + +# Default App (OpenVidu Call) +CALL_PRIVATE_ACCESS=false +CALL_USER= +CALL_SECRET= +CALL_ADMIN_USER=admin +CALL_ADMIN_SECRET=admin diff --git a/pro/docker-compose.yaml b/pro/docker-compose.yaml index 6c6dc90..cd3246a 100644 --- a/pro/docker-compose.yaml +++ b/pro/docker-compose.yaml @@ -155,14 +155,24 @@ services: - LAN_DOMAIN=${LAN_DOMAIN:-} - LAN_PRIVATE_IP=${LAN_PRIVATE_IP:-} - SERVER_PORT=6080 + - CALL_NAME_ID=OpenViduCall-LOCAL - LIVEKIT_URL_PRIVATE=ws://openvidu:7880/ - LIVEKIT_API_KEY=${LIVEKIT_API_KEY} - LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET} - - CALL_PRIVATE_ACCESS=DISABLED + - CALL_PRIVATE_ACCESS=${CALL_PRIVATE_ACCESS:-false} - CALL_USER=${CALL_USER:-} - CALL_SECRET=${CALL_SECRET:-} - CALL_ADMIN_SECRET=${CALL_ADMIN_SECRET:-} - CALL_RECORDING=${CALL_RECORDING:-} + - CALL_ADMIN_USER=${CALL_ADMIN_USER:-admin} + - CALL_ADMIN_SECRET=${CALL_ADMIN_SECRET:-admin} + - CALL_LOG_LEVEL=${CALL_LOG_LEVEL:-info} + - CALL_S3_BUCKET=${CALL_S3_BUCKET:-openvidu} + - CALL_S3_SERVICE_ENDPOINT=${CALL_S3_SERVICE_ENDPOINT:-http://minio:9000} + - CALL_S3_ACCESS_KEY=${MINIO_ACCESS_KEY} + - CALL_S3_SECRET_KEY=${MINIO_SECRET_KEY} + - CALL_AWS_REGION=${CALL_AWS_REGION:-us-east-1} + - CALL_S3_WITH_PATH_STYLE_ACCESS=${CALL_S3_WITH_PATH_STYLE_ACCESS:-true} volumes: - ./scripts/entrypoint_default_app.sh:/scripts/entrypoint.sh - ./scripts/utils.sh:/scripts/utils.sh