From 63247475a1e300e378f604f70580070a120d9b96 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 10 Dec 2019 16:39:22 +0100
Subject: Fix nginx config

CORS headers were removed. See https://www.nginx.com/resources/wiki/start/topics/depth/ifisevil/
---
 support/nginx/peertube | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'support/nginx')

diff --git a/support/nginx/peertube b/support/nginx/peertube
index a1cdc2221..a278524ba 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -120,6 +120,19 @@ server {
 
   # Bypass PeerTube for performance reasons. Could be removed
   location ~ ^/static/(webseed|redundancy|streaming-playlists)/ {
+    # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
+    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;
+    }
+
+    # Use this with nginx >= 1.17.0
+    # limit_rate $peertube_limit_rate;
+    # Or this if your nginx < 1.17.0
+    set $limit_rate $peertube_limit_rate;
+    limit_rate_after 5000k;
 
     if ($request_method = 'OPTIONS') {
       add_header 'Access-Control-Allow-Origin' '*';
@@ -140,20 +153,6 @@ server {
       access_log off;
     }
 
-    # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
-    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;
-    }
-
-    # Use this with nginx >= 1.17.0
-    # limit_rate $peertube_limit_rate;
-    # Or this if your nginx < 1.17.0
-    set $limit_rate $peertube_limit_rate;
-    limit_rate_after 5000k;
-
     root /var/www/peertube/storage;
 
     rewrite ^/static/webseed/(.*)$ /videos/$1 break;
-- 
cgit v1.2.3