From be69c7e52a0633f9cef18f36704180835e8ac773 Mon Sep 17 00:00:00 2001 From: cruizba Date: Tue, 3 Nov 2020 16:33:35 +0100 Subject: [PATCH] deployment-openvidu: delete unnecessary env variables and add media node env variables --- .../deployments/ce/docker-compose/.env | 7 ----- .../ce/docker-compose/docker-compose.yml | 4 +-- .../docker-compose/openvidu-server-pro/.env | 27 +++++++++++++------ .../openvidu-server-pro/docker-compose.yml | 6 ++--- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/openvidu-server/deployments/ce/docker-compose/.env b/openvidu-server/deployments/ce/docker-compose/.env index 85e642ad..86cba267 100644 --- a/openvidu-server/deployments/ce/docker-compose/.env +++ b/openvidu-server/deployments/ce/docker-compose/.env @@ -68,13 +68,6 @@ LETSENCRYPT_EMAIL=user@example.com # ALLOWED_ACCESS_TO_RESTAPI=198.51.100.1, 198.51.100.0/24 # ALLOWED_ACCESS_TO_RESTAPI= -# Public IP used by coturn, nginx and openvidu-server -# Possible values: -# - auto-ipv4: Auto discover public IPv4 using dns services (Default) -# - auto-ipv6: Auto discover public IPv6 using dns services -# - Any valid IPv4 and IPv6 value -# PUBLIC_IP=auto-ipv4 - # Whether to enable recording module or not OPENVIDU_RECORDING=false diff --git a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml index 95abdc28..12ef3c85 100644 --- a/openvidu-server/deployments/ce/docker-compose/docker-compose.yml +++ b/openvidu-server/deployments/ce/docker-compose/docker-compose.yml @@ -39,7 +39,7 @@ services: - KMS_URIS=["ws://localhost:8888/kurento"] - COTURN_REDIS_IP=127.0.0.1 - COTURN_REDIS_PASSWORD=${OPENVIDU_SECRET} - - COTURN_IP=${PUBLIC_IP:-auto-ipv4} + - COTURN_IP=${COTURN_IP:-auto-ipv4} kms: image: ${KMS_IMAGE:-kurento/kurento-media-server:6.14.0} @@ -96,4 +96,4 @@ services: - SUPPORT_DEPRECATED_API=${SUPPORT_DEPRECATED_API:-true} - REDIRECT_WWW=${REDIRECT_WWW:-false} - WORKER_CONNECTIONS=${WORKER_CONNECTIONS:-10240} - - PUBLIC_IP=${PUBLIC_IP:-auto-ipv4} + - PUBLIC_IP=${PROXY_PUBLIC_IP:-auto-ipv4} diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env index 74786e85..afb615de 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/.env @@ -71,14 +71,6 @@ LETSENCRYPT_EMAIL=user@example.com # ALLOWED_ACCESS_TO_RESTAPI=198.51.100.1, 198.51.100.0/24 # ALLOWED_ACCESS_TO_RESTAPI= -# Public IP used by coturn, nginx and openvidu-server -# Possible values: -# - auto-ipv4: Auto discover public IPv4 using dns services (Default) -# - auto-ipv6: Auto discover public IPv6 using dns services -# - Any valid IPv4 and IPv6 value -# PUBLIC_IP=auto-ipv4 - - # Mode of cluster management. Can be auto (OpenVidu manages Media Nodes on its own. # Parameter KMS_URIS is ignored) or manual (user must manage Media Nodes. Parameter # KMS_URIS is used: if any uri is provided it must be valid) @@ -279,6 +271,25 @@ OPENVIDU_CDR_PATH=/opt/openvidu/cdr ELASTICSEARCH_USERNAME=elasticadmin ELASTICSEARCH_PASSWORD= +# Media Node Configuration +# -------------------------- +# You can add any KMS environment variable as described in the +# documentation of the docker image: https://hub.docker.com/r/kurento/kurento-media-server +# If you want to add an environment variable to KMS, you must add a variable using this prefix: 'KMS_DOCKER_ENV_', +# followed by the environment variable you want to setup. +# For example if you want to setup KMS_MIN_PORT to 50000, it would be KMS_DOCKER_ENV_KMS_MIN_PORT=50000 + +# Docker hub kurento media server: https://hub.docker.com/r/kurento/kurento-media-server +# Uncomment the next line and define this variable with KMS image that you want use +# By default, KMS_IMAGE is defined in media nodes and it does not need to be specified unless +# you want to use an specific version of KMS +# KMS_IMAGE=kurento/kurento-media-server:6.14.0 + +# Uncomment the next line and define this variable to change +# the verbosity level of the logs of KMS +# Documentation: https://doc-kurento.readthedocs.io/en/stable/features/logging.html +# KMS_DOCKER_ENV_KMS_DEBUG_LEVEL=3,Kurento*:4,kms*:4,sdp*:4,webrtc*:4,*rtpendpoint:4,rtp*handler:4,rtpsynchronizer:4,agnosticbin:4 + # Cloudformation configuration # -------------------------- # If you're working outside AWS ignore this section diff --git a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml index bc43a802..d7d4f7f0 100644 --- a/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml +++ b/openvidu-server/deployments/pro/docker-compose/openvidu-server-pro/docker-compose.yml @@ -41,7 +41,7 @@ services: - KMS_URIS=[] - COTURN_REDIS_IP=127.0.0.1 - COTURN_REDIS_PASSWORD=${OPENVIDU_SECRET} - - COTURN_IP=${PUBLIC_IP:-auto-ipv4} + - COTURN_IP=${COTURN_IP:-auto-ipv4} - OPENVIDU_PRO_CLUSTER=true - OPENVIDU_PRO_KIBANA_HOST=${OPENVIDU_PRO_KIBANA_HOST:-http://127.0.0.1/kibana} - OPENVIDU_PRO_ELASTICSEARCH_HOST=${OPENVIDU_PRO_ELASTICSEARCH_HOST:-http://127.0.0.1:9200} @@ -66,7 +66,7 @@ services: - DB_PASSWORD=${OPENVIDU_SECRET} - MIN_PORT=40000 - MAX_PORT=65535 - - TURN_PUBLIC_IP=${PUBLIC_IP:-auto-ipv4} + - TURN_PUBLIC_IP=${TURN_PUBLIC_IP:-auto-ipv4} nginx: image: openvidu/openvidu-proxy:4.0.0-dev5 @@ -90,7 +90,7 @@ services: - SUPPORT_DEPRECATED_API=${SUPPORT_DEPRECATED_API:-true} - REDIRECT_WWW=${REDIRECT_WWW:-false} - WORKER_CONNECTIONS=${WORKER_CONNECTIONS:-10240} - - PUBLIC_IP=${PUBLIC_IP:-auto-ipv4} + - PUBLIC_IP=${PROXY_PUBLIC_IP:-auto-ipv4} elasticsearch: