From 5202501e0df521155673666474fa5f30aba64e67 Mon Sep 17 00:00:00 2001 From: OscarSotoSanchez Date: Tue, 24 Mar 2020 12:32:48 +0100 Subject: [PATCH] Change nginx confs --- .../docker/openvidu-docker-compose/.env | 2 +- .../docker-compose.yml | 30 +++++++++---------- .../docker/openvidu-docker-compose/kms.conf | 10 +++---- .../openvidu-call.conf | 8 ++--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/openvidu-server/docker/openvidu-docker-compose/.env b/openvidu-server/docker/openvidu-docker-compose/.env index 4e5f52d9..125b3d0b 100644 --- a/openvidu-server/docker/openvidu-docker-compose/.env +++ b/openvidu-server/docker/openvidu-docker-compose/.env @@ -1,2 +1,2 @@ openvidu_public_ip=192.168.1.66 -openvidu_secret="MY_SECRET" +openvidu_secret=MY_SECRET diff --git a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml index a6c63644..61beada2 100644 --- a/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml +++ b/openvidu-server/docker/openvidu-docker-compose/docker-compose.yml @@ -1,6 +1,20 @@ version: '3.1' services: + openvidu-ce: + image: openvidu/openvidu-server + entrypoint: ["java", "-jar", "-Dserver.ssl.enabled=false", "-Dopenvidu.publicurl=https://${openvidu_public_ip}:4443", "-Dserver.port=5443", "/openvidu-server.jar"] + network_mode: host + environment: + - openvidu.secret=${openvidu_secret} + - kms.uris="[\"ws://${openvidu_public_ip}:8888/kurento\"]" + + kms: + image: kurento/kurento-media-server + network_mode: host + environment: + - KMS_EXTERNAL_ADDRESS=${openvidu_public_ip} + redis-db: image: redis network_mode: host @@ -17,20 +31,6 @@ services: - MIN_PORT=40000 - MAX_PORT=65535 - kms: - image: kurento/kurento-media-server - network_mode: host - environment: - - KMS_EXTERNAL_ADDRESS=${openvidu_public_ip} - - openvidu-ce: - image: openvidu/openvidu-server - entrypoint: ["java", "-jar", "-Dserver.ssl.enabled=false", "-Dopenvidu.publicurl=https://${openvidu_public_ip}:4443", "-Dserver.port=5443", "/openvidu-server.jar"] - network_mode: host - environment: - - openvidu.secret=${openvidu_secret} - - kms.uris="[\"ws://${openvidu_public_ip}:8888/kurento\"]" - proxy: image: nginx network_mode: host @@ -39,7 +39,7 @@ services: - ./openvidu-call.conf:/etc/nginx/conf.d/openvidu-call.conf - ./openvidu.cert:/etc/ssl/openvidu/openvidu.cert - ./openvidu.key:/etc/ssl/openvidu/openvidu.key - command: /bin/bash -c "rm /etc/nginx/conf.d/default.conf && exec nginx -g 'daemon off;'" + command: /bin/bash -c "rm /etc/nginx/conf.d/default.conf | true && exec nginx -g 'daemon off;'" openvidu-call: image: openvidu-call diff --git a/openvidu-server/docker/openvidu-docker-compose/kms.conf b/openvidu-server/docker/openvidu-docker-compose/kms.conf index b60cc68d..3656fe3a 100644 --- a/openvidu-server/docker/openvidu-docker-compose/kms.conf +++ b/openvidu-server/docker/openvidu-docker-compose/kms.conf @@ -7,17 +7,17 @@ server { ssl_certificate_key /etc/ssl/openvidu/openvidu.key; ssl_trusted_certificate /etc/ssl/openvidu/openvidu.cert; - 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 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 Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; location / { diff --git a/openvidu-server/docker/openvidu-docker-compose/openvidu-call.conf b/openvidu-server/docker/openvidu-docker-compose/openvidu-call.conf index fee02ec6..b3d50160 100644 --- a/openvidu-server/docker/openvidu-docker-compose/openvidu-call.conf +++ b/openvidu-server/docker/openvidu-docker-compose/openvidu-call.conf @@ -17,10 +17,10 @@ server { 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 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;