X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=support%2Fnginx%2Fpeertube;h=00ce1d0dc73611c29abc30d1439572575bc7680e;hb=302eba0d898e38dca14739486441c27c0be6c62f;hp=31a690e298a4609a414351ada05bad7081aba8b3;hpb=afd4ee86ddb97f8d49585fddd318bedcd3ad55b8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/nginx/peertube b/support/nginx/peertube
index 31a690e29..00ce1d0dc 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -1,7 +1,6 @@
 # Minimum Nginx version required:  1.13.0 (released Apr 25, 2017)
 # Please check your Nginx installation features the following modules via 'nginx -V':
-# STANDARD HTTP MODULES: Core, Proxy, Rewrite.
-# OPTIONAL HTTP MODULES: Gzip, Headers, HTTP/2, Log, Real IP, SSL, Thread Pool, Upstream.
+# STANDARD HTTP MODULES: Core, Proxy, Rewrite, Access, Gzip, Headers, HTTP/2, Log, Real IP, SSL, Thread Pool, Upstream, AIO Multithreading.
 # THIRD PARTY MODULES:   None.
 
 server {
@@ -79,15 +78,6 @@ server {
     try_files /dev/null @api;
   }
 
-  location = /api/v1/users/me/avatar/pick {
-    limit_except POST HEAD { deny all; }
-
-    client_max_body_size                      2M; # default is 1M
-    add_header            X-File-Maximum-Size 2M always; # inform backend of the set value in bytes
-
-    try_files /dev/null @api;
-  }
-
   location = /api/v1/videos/upload {
     limit_except POST HEAD { deny all; }
 
@@ -95,8 +85,15 @@ server {
     # Note that temporary space is needed equal to the total size of all concurrent uploads.
     # This data gets stored in /var/lib/nginx by default, so you may want to put this directory
     # on a dedicated filesystem.
-    client_max_body_size                      8G; # default is 1M
-    add_header            X-File-Maximum-Size 8G always; # inform backend of the set value in bytes
+    client_max_body_size                      12G; # default is 1M
+    add_header            X-File-Maximum-Size 8G always; # inform backend of the set value in bytes before mime-encoding (x * 1.4 >= client_max_body_size)
+
+    try_files /dev/null @api;
+  }
+
+  location ~ ^/api/v1/(videos|video-playlists|video-channels|users/me) {
+    client_max_body_size                      3M; # default is 1M
+    add_header            X-File-Maximum-Size 2M always; # inform backend of the set value in bytes before mime-encoding (x * 1.4 >= client_max_body_size)
 
     try_files /dev/null @api;
   }
@@ -157,6 +154,7 @@ server {
   keepalive_timeout         10s; # default is 75
   resolver_timeout          10s; # default is 30
   reset_timedout_connection on;
+  proxy_ignore_client_abort on;
 
   tcp_nopush                on; # send headers in one piece
   tcp_nodelay               on; # don't buffer data sent, good for small data bursts in real time
@@ -246,7 +244,7 @@ server {
     sendfile_max_chunk 1M; # prevent one fast connection from entirely occupying the worker process. should be > 800k.
     aio threads;
 
-    # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/#/admin-remote-storage
+    # Use this in tandem with fuse-mounting i.e. https://docs.joinpeertube.org/admin-remote-storage
     # to serve files directly from a public bucket without proxying.
     # Assumes you have buckets named after the storage subdirectories, i.e. 'videos', 'redundancy', etc.
     #set $cdn <your S3-compatiable bucket public url mounted via fuse>;