Merge branch 'master' 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 5226e1742cfaf3b7804348ae2047c0eef2b64fb4..bd4ac121555f6b6938b48bba534bd814cb19b7b7 100644 (file)
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -1,12 +1,16 @@
 webserver:
-  hostname: "PEERTUBE_HOSTNAME"
+  hostname: "PEERTUBE_WEBSERVER_HOSTNAME"
   port:
-    __name: "PEERTUBE_PORT"
+    __name: "PEERTUBE_WEBSERVER_PORT"
     __format: "json"
   https:
-    __name: "PEERTUBE_HTTPS"
+    __name: "PEERTUBE_WEBSERVER_HTTPS"
     __format: "json"
 
+trust_proxy:
+  __name: "PEERTUBE_TRUST_PROXY"
+  __format: "json"
+
 database:
   hostname: "PEERTUBE_DB_HOSTNAME"
   port:
@@ -23,18 +27,87 @@ redis:
     __format: "json"
   auth: "PEERTUBE_REDIS_AUTH"
 
+smtp:
+  hostname: "PEERTUBE_SMTP_HOSTNAME"
+  port:
+    __name: "PEERTUBE_SMTP_PORT"
+    __format: "json"
+  username: "PEERTUBE_SMTP_USERNAME"
+  password: "PEERTUBE_SMTP_PASSWORD"
+  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"
 
+contact_form:
+  enabled:
+    __name: "PEERTUBE_CONTACT_FORM_ENABLED"
+    __format: "json"
+
 signup:
   enabled:
     __name: "PEERTUBE_SIGNUP_ENABLED"
     __format: "json"
   limit:
-    __name: "PEETUBE_SIGNUP_LIMIT"
+    __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"
+  description: "PEERTUBE_INSTANCE_DESCRIPTION"
+  terms: "PEERTUBE_INSTANCE_TERMS"