Merge branch 'mastodon:main' into main

This commit is contained in:
John Haugabook 2024-03-17 21:43:34 -04:00 committed by GitHub
commit 73188cc468
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions

View File

@ -554,6 +554,8 @@ You must serve the files with CORS headers, otherwise some functions of Mastodon
{{< page-ref page="admin/optional/object-storage" >}}
The bucket must support access control lists (ACLs). For AWS S3, this means setting the "Object Ownership" setting to "ACLs enabled". For Google Cloud Storage, this means setting the "Access control" setting to "Fine-grained".
#### `S3_ENABLED`
#### `S3_REGION`