logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 6c83fec9715340bd178de0a8ba595bb4ad10eb1a
parent: 2bb54d5c573a9783fb5cd36202ef548b23494daa
Author: tmyt <shigure@refy.net>
Date:   Wed, 19 Apr 2017 21:20:36 +0900

Make configuarable s3_permissions for paperclip (#2139)


Diffstat:

Mconfig/initializers/paperclip.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -16,7 +16,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' } - Paperclip::Attachment.default_options[:s3_permissions] = 'public-read' + Paperclip::Attachment.default_options[:s3_permissions] = ENV.fetch('S3_PERMISSION') { 'public-read' } Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' } Paperclip::Attachment.default_options[:s3_credentials] = {