mirror of
https://github.com/kikobar/mastodon.git
synced 2024-11-17 04:32:22 +00:00
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
Fix S3 default settings
This commit is contained in:
commit
16f9490d33
|
@ -11,7 +11,7 @@ if ENV['S3_ENABLED'] == 'true'
|
|||
Paperclip::Attachment.default_options[:s3_host_name] = ENV.fetch('S3_HOSTNAME') { "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com" }
|
||||
Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename'
|
||||
Paperclip::Attachment.default_options[:s3_headers] = { 'Cache-Control' => 'max-age=315576000', 'Expires' => 10.years.from_now.httpdate }
|
||||
Paperclip::Attachment.default_options[:s3_permissions] = 'public'
|
||||
Paperclip::Attachment.default_options[:s3_permissions] = 'public-read'
|
||||
Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' }
|
||||
|
||||
Paperclip::Attachment.default_options[:s3_credentials] = {
|
||||
|
|
Loading…
Reference in a new issue