mirror of
https://github.com/mastodon/mastodon.git
synced 2025-09-05 17:31:12 +00:00
fix: set s3_acl_enabled to false when s3_permission empty
This commit is contained in:
parent
89a8e6e622
commit
1dfd82fd08
|
@ -69,6 +69,7 @@ if ENV['S3_ENABLED'] == 'true'
|
||||||
)
|
)
|
||||||
|
|
||||||
Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
|
Paperclip::Attachment.default_options[:s3_permissions] = ->(*) { nil } if ENV['S3_PERMISSION'] == ''
|
||||||
|
Paperclip::Attachment.default_options[:s3_acl_enabled] = ->(*) { false } if ENV['S3_PERMISSION'] == ''
|
||||||
|
|
||||||
if ENV.has_key?('S3_ENDPOINT')
|
if ENV.has_key?('S3_ENDPOINT')
|
||||||
Paperclip::Attachment.default_options[:s3_options].merge!(
|
Paperclip::Attachment.default_options[:s3_options].merge!(
|
||||||
|
|
Loading…
Reference in New Issue
Block a user