EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-10-17 07:46:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
STAM 2020-08-04 18:09:14 +03:00
commit 7cffa9e877
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
balancer/rtmp-hls/Dockerfile
View File

@ -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

1
balancer/rtmp-hls/conf/nginx.conf
View File

@ -58,6 +58,7 @@ rtmp {
http {
include /etc/nginx/sites-enabled/*.conf;
sendfile off;
tcp_nopush on;
directio 512;

1
balancer/rtmp-hls/conf/nginx_no-ffmpeg.conf
View File

@ -42,6 +42,7 @@ rtmp {
http {
include /etc/nginx/sites-enabled/*.conf;
sendfile off;
tcp_nopush on;
directio 512;