Merge branch 'release/3.4.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 1f7fbf849e36ed62d1097ea4064102635399e637..7c430a9955c394fab88947624148c155b14a1864 100644 (file)
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -7,7 +7,9 @@ webserver:
     __name: "PEERTUBE_WEBSERVER_HTTPS"
     __format: "json"
 
-trust_proxy: "PEERTUBE_TRUST_PROXY"
+trust_proxy:
+  __name: "PEERTUBE_TRUST_PROXY"
+  __format: "json"
 
 database:
   hostname: "PEERTUBE_DB_HOSTNAME"
@@ -17,6 +19,9 @@ database:
   suffix: "PEERTUBE_DB_SUFFIX"
   username: "PEERTUBE_DB_USERNAME"
   password: "PEERTUBE_DB_PASSWORD"
+  ssl:
+    __name: "PEERTUBE_DB_SSL"
+    __format: "json"
 
 redis:
   hostname: "PEERTUBE_REDIS_HOSTNAME"
@@ -40,6 +45,42 @@ smtp:
     __format: "json"
   from_address: "PEERTUBE_SMTP_FROM"
 
+object_storage:
+  enabled:
+    __name: "PEERTUBE_OBJECT_STORAGE_ENABLED"
+    __format: "json"
+
+  endpoint: "PEERTUBE_OBJECT_STORAGE_ENDPOINT"
+
+  region: "PEERTUBE_OBJECT_STORAGE_REGION"
+
+  max_upload_part:
+    __name: "PEERTUBE_OBJECT_STORAGE_MAX_UPLOAD_PART"
+    __format: "json"
+
+  streaming_playlists:
+    bucket_name: "PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_BUCKET_NAME"
+    prefix: "PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_PREFIX"
+    base_url: "PEERTUBE_OBJECT_STORAGE_STREAMING_PLAYLISTS_BASE_URL"
+
+  videos:
+    bucket_name: "PEERTUBE_OBJECT_STORAGE_VIDEOS_BUCKET_NAME"
+    prefix: "PEERTUBE_OBJECT_STORAGE_VIDEOS_PREFIX"
+    base_url: "PEERTUBE_OBJECT_STORAGE_VIDEOS_BASE_URL"
+
+webadmin:
+  configuration:
+    edit:
+      allowed: 
+        __name: "PEERTUBE_ALLOW_WEBADMIN_CONFIG"
+        __format: "json"
+
+log:
+  level: "PEERTUBE_LOG_LEVEL"
+  log_ping_requests:
+    __name: "PEERTUBE_LOG_PING_REQUESTS"
+    __format: "json"
+
 user:
   video_quota:
     __name: "PEERTUBE_USER_VIDEO_QUOTA"
@@ -48,6 +89,11 @@ user:
 admin:
   email: "PEERTUBE_ADMIN_EMAIL"
 
+contact_form:
+  enabled:
+    __name: "PEERTUBE_CONTACT_FORM_ENABLED"
+    __format: "json"
+
 signup:
   enabled:
     __name: "PEERTUBE_SIGNUP_ENABLED"
@@ -96,10 +142,23 @@ transcoding:
     720p:
       __name: "PEERTUBE_TRANSCODING_720P"
       __format: "json"
-    1080:
+    1080p:
       __name: "PEERTUBE_TRANSCODING_1080P"
       __format: "json"
-    
+    1440p:
+      __name: "PEERTUBE_TRANSCODING_1440P"
+      __format: "json"
+    2160p:
+      __name: "PEERTUBE_TRANSCODING_2160P"
+      __format: "json"
+  webtorrent:
+    enabled:
+      __name: "PEERTUBE_TRANSCODING_WEBTORRENT_ENABLED"
+      __format: "json"
+  hls:
+    enabled:
+      __name: "PEERTUBE_TRANSCODING_HLS_ENABLED"
+      __format: "json"
 
 instance:
   name: "PEERTUBE_INSTANCE_NAME"