X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=support%2Fnginx%2Fpeertube;h=abb83d5c411d9dae4f5b3fb98b1fc1687efcaa96;hb=09f33366a765b860555236af877e5f37b6886d02;hp=0993085d53ef96ae22a02d847b11ac830c7086f5;hpb=6c7317a0a363a609e7bffc4306aef482bda088f1;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/support/nginx/peertube b/support/nginx/peertube
index 0993085d5..abb83d5c4 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -78,7 +78,14 @@ server {
     try_files /dev/null @api;
   }
 
-  location = /api/v1/videos/upload {
+  location = /api/v1/videos/upload-resumable {
+    client_max_body_size    0;
+    proxy_request_buffering off;
+
+    try_files /dev/null @api;
+  }
+
+  location ~ ^/api/v1/videos/(upload|([^/]+/studio/edit))$ {
     limit_except POST HEAD { deny all; }
 
     # This is the maximum upload size, which roughly matches the maximum size of a video file.
@@ -92,8 +99,8 @@ server {
   }
 
   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)
+    client_max_body_size                      6M; # default is 1M
+    add_header            X-File-Maximum-Size 4M always; # inform backend of the set value in bytes before mime-encoding (x * 1.4 >= client_max_body_size)
 
     try_files /dev/null @api;
   }
@@ -165,7 +172,7 @@ server {
 
   # Bypass PeerTube for performance reasons. Optional.
   # Should be consistent with client-overrides assets list in /server/controllers/client.ts
-  location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png))$ {
+  location ~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$ {
     add_header Cache-Control "public, max-age=31536000, immutable"; # Cache 1 year
 
     root /var/www/peertube;
@@ -244,12 +251,6 @@ 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
-    # 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>;
-    #rewrite ^/static/webseed/(.*)$ $cdn/videos/$1 redirect;
-    #rewrite ^/static/(.*)$         $cdn/$1        redirect;
     rewrite ^/static/webseed/(.*)$ /videos/$1 break;
     rewrite ^/static/(.*)$         /$1        break;