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 fdcbeb5a0156376a8c979b6efe1f85476f997097..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'
@@ -21,66 +30,19 @@ redis:
   port: 6379
   auth: null
 
-# SMTP server to send emails
-smtp:
-  hostname: null
-  port: 465
-  username: null
-  password: null
-  tls: true
-  disable_starttls: false
-  ca_file: null # Used for self signed certificates
-  from_address: 'admin@example.com'
-
 # From the project root directory
 storage:
   avatars: '../data/avatars/'
-  certs: '../data/certs/'
   videos: '../data/videos/'
   logs: '../data/logs/'
   previews: '../data/previews/'
   thumbnails: '../data/thumbnails/'
   torrents: '../data/torrents/'
+  captions: '../data/captions/'
   cache: '../data/cache/'
 
 log:
   level: 'info' # debug/info/warning/error
 
-cache:
-  previews:
-    size: 100 # Max number of previews you want to cache
-
 admin:
-  email: undefined
-
-signup:
-  enabled: false
-  limit: -1
-
-user:
-  # Default value of maximum video BYTES the user can upload (does not take into account transcoded files).
-  # -1 == unlimited
-  video_quota: -1
-
-# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag
-# Uses a lot of CPU!
-transcoding:
-  enabled: false
-  threads: 2
-  resolutions: # Only created if the original video has a higher resolution
-    240p: true
-    360p: true
-    480p: true
-    720p: true
-    1080p: true
-
-# Instance settings
-instance:
-  name: 'PeerTube'
-  short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.'
-  description: '' # Support markdown
-  terms: '' # Support markdown
-  default_client_route: '/videos/trending'
-  customizations:
-    javascript: '' # Directly your JavaScript code (without <script> tags). Will be eval at runtime
-    css: '' # Directly your CSS code (without <style> tags). Will be injected at runtime
+  email: null