Merge branch 'release/v1.0.0' into develop

[github/Chocobozzz/PeerTube.git] / support / docker / production / config / custom-environment-variables.yaml

diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index e157aaea9ac29b50ba80a9fc6f8cd5ef194ae22e..1f7fbf849e36ed62d1097ea4064102635399e637 100644 (file)
--- 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:
@@ -33,8 +35,16 @@ smtp:
   tls:
     __name: "PEERTUBE_SMTP_TLS"
     __format: "json"
+  disable_starttls:
+    __name: "PEERTUBE_SMTP_DISABLE_STARTTLS"
+    __format: "json"
   from_address: "PEERTUBE_SMTP_FROM"
 
+user:
+  video_quota:
+    __name: "PEERTUBE_USER_VIDEO_QUOTA"
+    __format: "json"
+
 admin:
   email: "PEERTUBE_ADMIN_EMAIL"
 
@@ -46,10 +56,50 @@ signup:
     __name: "PEERTUBE_SIGNUP_LIMIT"
     __format: "json"
 
+search:
+  remote_uri:
+    users:
+      __name: "PEERTUBE_SEARCH_REMOTEURI_USERS"
+      __format: "json"
+    anonymous:
+      __name: "PEERTUBE_SEARCH_REMOTEURI_ANONYMOUS"
+      __format: "json"
+
+import:
+  videos:
+    http:
+      enabled:
+        __name: "PEERTUBE_IMPORT_VIDEOS_HTTP"
+        __format: "json"
+    torrent:
+      enabled:
+        __name: "PEERTUBE_IMPORT_VIDEOS_TORRENT"
+        __format: "json"
+
 transcoding:
   enabled:
     __name: "PEERTUBE_TRANSCODING_ENABLED"
     __format: "json"
+  threads:
+    __name: "PEERTUBE_TRANSCODING_THREADS"
+    __format: "json"
+  resolutions:
+    240p:
+      __name: "PEERTUBE_TRANSCODING_240P"
+      __format: "json"
+    360p:
+      __name: "PEERTUBE_TRANSCODING_360P"
+      __format: "json"
+    480p:
+      __name: "PEERTUBE_TRANSCODING_480P"
+      __format: "json"
+    720p:
+      __name: "PEERTUBE_TRANSCODING_720P"
+      __format: "json"
+    1080:
+      __name: "PEERTUBE_TRANSCODING_1080P"
+      __format: "json"
+    
 
 instance:
   name: "PEERTUBE_INSTANCE_NAME"