Merge branch 'develop'

EpicMorg · Aug 4, 2020 · 7cffa9e · 7cffa9e
2 parents 18a4ba8 + 652c00f
commit 7cffa9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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
@@ -42,6 +42,7 @@ rtmp {
 
 
 http {
+	include /etc/nginx/sites-enabled/*.conf;
 	sendfile off;
 	tcp_nopush on;
 	directio 512;