2 files changed, 12 insertions, 0 deletions

diff --git a/config/default.yaml b/config/default.yaml
index 26fc5c128..bf772faf6 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -6,6 +6,12 @@ webserver:
   hostname: 'localhost'
   port: 9000
 
+# Proxies to trust to get real client IP
+# If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
+# If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
+trust_proxy:
+  - 'loopback'
+
 # Your database name will be "peertube"+database.suffix
 database:
   hostname: 'localhost'
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 43cacee3b..d362e0b8a 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -7,6 +7,12 @@ webserver:
   hostname: 'example.com'
   port: 443
 
+# Proxies to trust to get real client IP
+# If you run PeerTube just behind a local proxy (nginx), keep 'loopback'
+# If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet)
+trust_proxy:
+  - 'loopback'
+
 # Your database name will be "peertube"+database.suffix
 database:
   hostname: 'localhost'