From 9efeb6c7a62b7bcf34a0c2abad22c2d8f52252d9 Mon Sep 17 00:00:00 2001 From: OscarSotoSanchez Date: Mon, 20 Apr 2020 18:45:56 +0200 Subject: [PATCH] recording fixed --- .../docker/openvidu-docker-compose/docker-compose.yml | 7 ++++--- .../default_nginx_conf/ce/default-app-without-demos.conf | 4 ++++ .../openvidu-proxy/default_nginx_conf/ce/default-app.conf | 4 ++++ .../default_nginx_conf/pro/default-app-without-demos.conf | 7 +++++-- .../openvidu-proxy/default_nginx_conf/pro/default.conf | 7 +++++-- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml index 324acd9b..daeca250 100644 --- a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml +++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml @@ -18,7 +18,7 @@ version: '3.1' services: openvidu-server: - image: openvidu/openvidu-server:2.13.0-beta7 + image: openvidu/openvidu-server:2.13.0-beta8 restart: on-failure network_mode: host entrypoint: ['/bin/bash', '-c', 'export COTURN_IP=`curl --silent ifconfig.co`; /usr/local/bin/entrypoint.sh'] @@ -44,6 +44,7 @@ services: core: -1 volumes: - /opt/openvidu/kms-crashes:/opt/openvidu/kms-crashes + - ${OPENVIDU_RECORDING_PATH}:${OPENVIDU_RECORDING_PATH} environment: - KMS_MIN_PORT=40000 - KMS_MAX_PORT=57000 @@ -67,13 +68,13 @@ services: - MAX_PORT=65535 nginx: - image: openvidu/openvidu-proxy:1.0.0-beta5 + image: openvidu/openvidu-proxy:1.0.0-beta6 restart: on-failure network_mode: host volumes: - ./certificates:/etc/letsencrypt - ./owncert:/owncert - - /opt/openvidu/custom-layout:/opt/openvidu/custom-layout + - ${OPENVIDU_RECORDING_CUSTOM_LAYOUT}:/opt/openvidu/custom-layout environment: - DOMAIN_OR_PUBLIC_IP=${OPENVIDU_DOMAIN_OR_PUBLIC_IP} - CERTIFICATE_TYPE=${CERTIFICATE_TYPE} diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app-without-demos.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app-without-demos.conf index 97d0e807..e63ee351 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app-without-demos.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app-without-demos.conf @@ -52,6 +52,10 @@ server { root /opt/openvidu; } + location /recordings { + proxy_pass http://openviduserver; + } + location /api { proxy_pass http://openviduserver; } diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app.conf index d189ab39..f98870a7 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/ce/default-app.conf @@ -52,6 +52,10 @@ server { root /opt/openvidu; } + location /recordings { + proxy_pass http://openviduserver; + } + location /api { proxy_pass http://openviduserver; } diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default-app-without-demos.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default-app-without-demos.conf index 68cc5993..7c55fec7 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default-app-without-demos.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default-app-without-demos.conf @@ -87,6 +87,10 @@ server { root /opt/openvidu; } + location /recordings { + proxy_pass http://openviduserver; + } + location /api { proxy_pass http://openviduserver; } @@ -130,7 +134,6 @@ server { } location /inspector { - rewrite ^/inspector/(.*)$ /$1 break; - proxy_pass http://openviduserver/; + proxy_pass http://openviduserver; } } diff --git a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf index a168dd1e..7035a915 100644 --- a/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf +++ b/openvidu-server/docker/openvidu-proxy/default_nginx_conf/pro/default.conf @@ -97,6 +97,10 @@ server { root /opt/openvidu; } + location /recordings { + proxy_pass http://openviduserver; + } + location /api { proxy_pass http://openviduserver; } @@ -140,7 +144,6 @@ server { } location /inspector { - rewrite ^/inspector/(.*)$ /$1 break; - proxy_pass http://openviduserver/; + proxy_pass http://openviduserver; } }