aboutsummaryrefslogtreecommitdiffhomepage
path: root/support/docker
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-03-07 10:42:31 +0100
committerChocobozzz <me@florianbigard.com>2023-03-07 10:42:31 +0100
commitd9dbf27a7dacb42e49e21d5691141c2edf885644 (patch)
tree5f33a1125099b14f94d61091061d8b754a1e4784 /support/docker
parent692ae8c31caa5a404142c9f46e03fdc8dc5b233f (diff)
parenta3e5f7e732cca41267314d64307bdcfebd12e7de (diff)
downloadPeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.tar.gz
PeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.tar.zst
PeerTube-d9dbf27a7dacb42e49e21d5691141c2edf885644.zip
Merge branch 'release/5.1.0' into develop
Diffstat (limited to 'support/docker')
-rw-r--r--support/docker/production/config/custom-environment-variables.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml
index 1d889fe7d..10432e6a0 100644
--- a/support/docker/production/config/custom-environment-variables.yaml
+++ b/support/docker/production/config/custom-environment-variables.yaml
@@ -57,6 +57,15 @@ object_storage:
57 57
58 region: "PEERTUBE_OBJECT_STORAGE_REGION" 58 region: "PEERTUBE_OBJECT_STORAGE_REGION"
59 59
60 upload_acl:
61 public: "PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PUBLIC"
62 private: "PEERTUBE_OBJECT_STORAGE_UPLOAD_ACL_PRIVATE"
63
64 proxy:
65 proxify_private_files:
66 __name: "PEERTUBE_OBJECT_STORAGE_PROXY_PROXIFY_PRIVATE_FILES"
67 __format: "json"
68
60 credentials: 69 credentials:
61 access_key_id: "PEERTUBE_OBJECT_STORAGE_CREDENTIALS_ACCESS_KEY_ID" 70 access_key_id: "PEERTUBE_OBJECT_STORAGE_CREDENTIALS_ACCESS_KEY_ID"
62 secret_access_key: 'PEERTUBE_OBJECT_STORAGE_CREDENTIALS_SECRET_ACCESS_KEY' 71 secret_access_key: 'PEERTUBE_OBJECT_STORAGE_CREDENTIALS_SECRET_ACCESS_KEY'