Merge branch 'develop' into cli-wrapper

3 files changed, 6 insertions, 1 deletions

diff --git a/support/docker/production/.env b/support/docker/production/.env
index 51c4e0ace..8af161b2a 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -3,6 +3,7 @@ PEERTUBE_DB_PASSWORD=postgres_password
 PEERTUBE_WEBSERVER_HOSTNAME=domain.tld
 PEERTUBE_WEBSERVER_PORT=443
 PEERTUBE_WEBSERVER_HTTPS=true
+PEERTUBE_TRUST_PROXY=127.0.0.1
 PEERTUBE_SMTP_USERNAME=
 PEERTUBE_SMTP_PASSWORD=
 PEERTUBE_SMTP_HOSTNAME=
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 1c732e2e0..daf885813 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -7,6 +7,8 @@ webserver:
     __name: "PEERTUBE_WEBSERVER_HTTPS"
     __format: "json"
 
+trust_proxy: "PEERTUBE_TRUST_PROXY"
+
 database:
   hostname: "PEERTUBE_DB_HOSTNAME"
   port:
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 {
     root /var/www/certbot;
   }
 
+  # Bypass PeerTube for performance reasons. Could be removed
   location ~ ^/client/(.*\.(js|css|woff2|otf|ttf|woff|eot))$ {
     add_header Cache-Control "public, max-age=31536000, immutable";
 
     alias /var/www/peertube/peertube-latest/client/dist/$1;
   }
 
+  # Bypass PeerTube for performance reasons. Could be removed
   location ~ ^/static/(thumbnails|avatars)/ {
     if ($request_method = 'OPTIONS') {
       add_header 'Access-Control-Allow-Origin' '*';
@@ -102,7 +104,7 @@ server {
     send_timeout                600;
   }
 
-  # Bypass PeerTube webseed route for better performances
+  # Bypass PeerTube for performance reasons. Could be removed
   location /static/webseed {
     # Clients usually have 4 simultaneous webseed connections, so the real limit is 3MB/s per client
     limit_rate 800k;