nutomic/peertube.social
1
0
Fork 2
Code Issues 4 Pull requests Releases Wiki Activity

Upgrade to Peertube 2.1.0

Browse source
This commit is contained in:
Felix 2020-02-16 17:46:09 +01:00
parent 338ec410bc
commit 48bb3f19cf
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/docker-compose.yml
View file

@ -17,7 +17,7 @@ services:
restart: "always" restart: "always"
peertube: peertube:
image: chocobozzz/peertube:v2.0.0-stretch image: chocobozzz/peertube:v2.1.0-buster
env_file: env_file:
- .env - .env
volumes: volumes:

10
templates/nginx.conf
View file

@ -95,7 +95,7 @@ ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECD
add_header Cache-Control "public, max-age=31536000, immutable"; add_header Cache-Control "public, max-age=31536000, immutable";
} }
} }
location ~ ^/static/(webseed|redundancy)/ { location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
# NOTE: Its not possible to use proxy_cache for files that are served from disk without complicated workarounds # NOTE: Its not possible to use proxy_cache for files that are served from disk without complicated workarounds
# Anyway caching is not a great idea because files are changed on disk after transcoding. # Anyway caching is not a great idea because files are changed on disk after transcoding.
#slice 1m; #slice 1m;
@ -111,7 +111,12 @@ ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECD
#add_header X-Cache-Status $upstream_cache_status; #add_header X-Cache-Status $upstream_cache_status;
# Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
limit_rate 800k; set $peertube_limit_rate 800k;
# Increase rate limit in HLS mode, because we don't have multiple simultaneous connections
if ($request_uri ~ -fragmented.mp4$) {
set $peertube_limit_rate 5000k;
}
if ($request_method = 'OPTIONS') { if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Origin' '*';
@ -136,6 +141,7 @@ ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECD
rewrite ^/static/webseed/(.*)$ /videos/$1 break; rewrite ^/static/webseed/(.*)$ /videos/$1 break;
rewrite ^/static/redundancy/(.*)$ /redundancy/$1 break; rewrite ^/static/redundancy/(.*)$ /redundancy/$1 break;
rewrite ^/static/streaming-playlists/(.*)$ /streaming-playlists/$1 break;
try_files $uri /; try_files $uri /;
} }