Skip to content
Snippets Groups Projects
Unverified Commit 290d78ce authored by David Hewitt's avatar David Hewitt Committed by GitHub
Browse files

Allow unsetting x-amz-acl S3 Permission headers (#20510)

Some "S3 Compatible" storage providers (Cloudflare R2 is one such example) don't support setting ACLs on individual uploads with the `x-amz-acl` header, and instead just have a visibility for the whole bucket. To support uploads to such providers without getting unsupported errors back, lets use a black `S3_PERMISSION` env var to indicate that these headers shouldn't be sent.

This is tested as working with Cloudflare R2.
parent cf77d938
No related branches found
No related tags found
No related merge requests found
......@@ -67,6 +67,12 @@ if ENV['S3_ENABLED'] == 'true'
retry_limit: 0,
}
)
if ENV['S3_PERMISSION'] == ''
Paperclip::Attachment.default_options.merge!(
s3_permissions: ->(*) { nil }
)
end
if ENV.has_key?('S3_ENDPOINT')
Paperclip::Attachment.default_options[:s3_options].merge!(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment