From 652c00fa4dce695f7d89cf9f164bf57ec1d4086c Mon Sep 17 00:00:00 2001 From: STAM Date: Tue, 4 Aug 2020 18:07:54 +0300 Subject: [PATCH] epicmorg/balancer:rtmp-hls --- balancer/rtmp-hls/Dockerfile | 3 ++- balancer/rtmp-hls/conf/nginx.conf | 1 + balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/balancer/rtmp-hls/Dockerfile b/balancer/rtmp-hls/Dockerfile index 5dc4f3f79..75bbe5dcc 100644 --- a/balancer/rtmp-hls/Dockerfile +++ b/balancer/rtmp-hls/Dockerfile @@ -84,7 +84,8 @@ RUN ln -sf /dev/stdout /var/log/nginx/access.log && \ ################################################################## # Copy nginx config file to container ################################################################## -RUN rm -rfv /etc/nginx/nginx.conf +RUN rm -rfv /etc/nginx/nginx.conf \ + /etc/nginx/sites-avalible/default COPY conf/nginx.conf /etc/nginx/nginx.conf diff --git a/balancer/rtmp-hls/conf/nginx.conf b/balancer/rtmp-hls/conf/nginx.conf index 924887e51..938da01e2 100644 --- a/balancer/rtmp-hls/conf/nginx.conf +++ b/balancer/rtmp-hls/conf/nginx.conf @@ -58,6 +58,7 @@ rtmp { http { + include /etc/nginx/sites-enabled/*.conf; sendfile off; tcp_nopush on; directio 512; diff --git a/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf b/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf index 37dff15d7..99644e14f 100644 --- a/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf +++ b/balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf @@ -42,6 +42,7 @@ rtmp { http { + include /etc/nginx/sites-enabled/*.conf; sendfile off; tcp_nopush on; directio 512;