diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.override.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.override.yml new file mode 100644 index 00000000..769c2d6b --- /dev/null +++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.override.yml @@ -0,0 +1,11 @@ +version: '3.1' + +services: + app: + image: openvidu/openvidu-call:2.13.0-beta1 + restart: on-failure + ports: + - "5442:80" + environment: + - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP} + - OPENVIDU_SECRET=${OPENVIDU_SECRET} diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml index 105898ca..24db43d1 100644 --- a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml +++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml @@ -21,11 +21,13 @@ services: - COTURN_REDIS_IP=127.0.0.1 kms: - image: kurento/kurento-media-server:6.13.0 + image: kurento/kurento-media-server-dev:6.13 restart: on-failure network_mode: host environment: - KMS_EXTERNAL_ADDRESS=auto + - KMS_MIN_PORT=40000 + - KMS_MAX_PORT=57000 redis-db: image: redis:5.0.7 @@ -41,7 +43,7 @@ services: - TURN_LISTEN_PORT=3478 - DB_NAME=0 - DB_PASSWORD=turn - - MIN_PORT=40000 + - MIN_PORT=57001 - MAX_PORT=65535 openvidu-proxy: @@ -49,19 +51,9 @@ services: restart: on-failure network_mode: host volumes: - - ./nginx_conf:/nginx_conf + - ./certificates:/etc/letsencrypt - ./owncert:/owncert environment: - DOMAIN_OR_PUBLIC_IP=${DOMAIN_OR_PUBLIC_IP} - CERTIFICATE_TYPE=${CERTIFICATE_TYPE} - LETSENCRYPT_EMAIL=${LETSENCRYPT_EMAIL} - - openvidu-call: - image: openvidu/openvidu-call:2.13.0-beta1 - restart: on-failure - ports: - - "5442:80" - environment: - - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP} - - OPENVIDU_SECRET=${OPENVIDU_SECRET} - diff --git a/openvidu-server/docker/openvidu-docker-compose/nginx_conf/default.conf b/openvidu-server/docker/openvidu-docker-compose/nginx_conf/default.conf deleted file mode 100644 index bd2ebb3a..00000000 --- a/openvidu-server/docker/openvidu-docker-compose/nginx_conf/default.conf +++ /dev/null @@ -1,12 +0,0 @@ -server { - listen 80; - server_name {domain_name}; - - location / { - return 301 https://$host$request_uri; - } - - location /.well-known/acme-challenge/ { - root /var/www/certbot; - } -} \ No newline at end of file diff --git a/openvidu-server/docker/openvidu-docker-compose/nginx_conf/openvidu-call.conf b/openvidu-server/docker/openvidu-docker-compose/nginx_conf/openvidu-call.conf deleted file mode 100644 index 5721e540..00000000 --- a/openvidu-server/docker/openvidu-docker-compose/nginx_conf/openvidu-call.conf +++ /dev/null @@ -1,66 +0,0 @@ -upstream openviducall { - server localhost:5442; -} - -upstream openviduserver { - server localhost:5443; -} - -server { - listen 443 ssl; - server_name {domain_name}; - - ssl_certificate /etc/letsencrypt/live/{domain_name}/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/{domain_name}/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/{domain_name}/fullchain.pem; - - ssl_session_cache shared:SSL:50m; - ssl_session_timeout 5m; - ssl_stapling on; - ssl_stapling_verify on; - - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4"; - - ssl_prefer_server_ciphers on; - - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Proto https; - proxy_headers_hash_bucket_size 512; - proxy_redirect off; - - # Websockets - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - - # Openvidu Call - location / { - proxy_pass http://openviducall; - } - - # Openvidu Server - location /api { - proxy_pass http://openviduserver; - } - - location /openvidu { - proxy_pass http://openviduserver; - } - - location /info { - proxy_pass http://openviduserver; - } - - location /config { - proxy_pass http://openviduserver; - } - - location /dashboard { - rewrite ^/dashboard/(.*)$ /$1 break; - proxy_pass http://openviduserver/; - } -} \ No newline at end of file