aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-09-17 15:45:17 +0200
committerChocobozzz <me@florianbigard.com>2018-09-17 17:45:54 +0200
commit415acc63cf3b51c91f70f75fe93ad0384f7d176a (patch)
treecd914c4103a8d7b7024a26f5d8788f5e80bd1ded
parent8c72543a4af7a613496e0581a939996fc284f861 (diff)
downloadPeerTube-415acc63cf3b51c91f70f75fe93ad0384f7d176a.tar.gz
PeerTube-415acc63cf3b51c91f70f75fe93ad0384f7d176a.tar.zst
PeerTube-415acc63cf3b51c91f70f75fe93ad0384f7d176a.zip
Add comments in nginx regarding blocks that can be safely removed
-rw-r--r--README.md3
-rw-r--r--support/nginx/peertube4
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index cd522301b..9fb89039b 100644
--- a/README.md
+++ b/README.md
@@ -97,11 +97,10 @@ BitTorrent) inside the web browser, as of today.
97## Dependencies 97## Dependencies
98 98
99 * nginx 99 * nginx
100 * PostgreSQL 100 * **PostgreSQL >= 9.6**
101 * **Redis >= 2.8.18** 101 * **Redis >= 2.8.18**
102 * **NodeJS >= 8.x** 102 * **NodeJS >= 8.x**
103 * yarn 103 * yarn
104 * OpenSSL (cli)
105 * **FFmpeg >= 3.x** 104 * **FFmpeg >= 3.x**
106 105
107## Run in production 106## Run in production
diff --git a/support/nginx/peertube b/support/nginx/peertube
index 0da427037..b00031133 100644
--- a/support/nginx/peertube
+++ b/support/nginx/peertube
@@ -58,12 +58,14 @@ server {
58 root /var/www/certbot; 58 root /var/www/certbot;
59 } 59 }
60 60
61 # Bypass PeerTube for performance reasons. Could be removed
61 location ~ ^/client/(.*\.(js|css|woff2|otf|ttf|woff|eot))$ { 62 location ~ ^/client/(.*\.(js|css|woff2|otf|ttf|woff|eot))$ {
62 add_header Cache-Control "public, max-age=31536000, immutable"; 63 add_header Cache-Control "public, max-age=31536000, immutable";
63 64
64 alias /var/www/peertube/peertube-latest/client/dist/$1; 65 alias /var/www/peertube/peertube-latest/client/dist/$1;
65 } 66 }
66 67
68 # Bypass PeerTube for performance reasons. Could be removed
67 location ~ ^/static/(thumbnails|avatars)/ { 69 location ~ ^/static/(thumbnails|avatars)/ {
68 if ($request_method = 'OPTIONS') { 70 if ($request_method = 'OPTIONS') {
69 add_header 'Access-Control-Allow-Origin' '*'; 71 add_header 'Access-Control-Allow-Origin' '*';
@@ -102,7 +104,7 @@ server {
102 send_timeout 600; 104 send_timeout 600;
103 } 105 }
104 106
105 # Bypass PeerTube webseed route for better performances 107 # Bypass PeerTube for performance reasons. Could be removed
106 location /static/webseed { 108 location /static/webseed {
107 # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client 109 # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
108 limit_rate 800k; 110 limit_rate 800k;