Merge branch 'master' into develop

[github/Chocobozzz/PeerTube.git] / support / docker / production / config / production.yaml

diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml
index 41272ba26c969bc6779239cea914d7a3fd05f898..4970bbccab70497b769c73563d8383e12afc1b12 100644 (file)
--- a/support/docker/production/config/production.yaml
+++ b/support/docker/production/config/production.yaml
@@ -1,4 +1,5 @@
 listen:
+  hostname: '0.0.0.0'
   port: 9000
 
 # Correspond to your reverse proxy "listen" configuration
@@ -7,9 +8,17 @@ webserver:
   hostname: undefined
   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'
+  - 'linklocal'
+  - 'uniquelocal'
+
 # Your database name will be "peertube"+database.suffix
 database:
-  hostname: 'db'
+  hostname: 'postgres'
   port: 5432
   suffix: ''
   username: 'postgres'
@@ -29,6 +38,7 @@ storage:
   previews: '../data/previews/'
   thumbnails: '../data/thumbnails/'
   torrents: '../data/torrents/'
+  captions: '../data/captions/'
   cache: '../data/cache/'
 
 log: