logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 363de2dffdfbc73fe87d0b1afaf7fefed0aeabba
parent: 6a1ac9b31fb6a8270bb6e25b1a8a459abf7a4f25
Author: Joachim Viide <jviide@iki.fi>
Date:   Sun, 16 Apr 2017 05:01:58 +0300

Leave out the "Expires" header from S3 uploads (#1886)


Diffstat:

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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -15,7 +15,7 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:url] = ':s3_domain_url' 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_headers] = { 'Cache-Control' => 'max-age=315576000' } Paperclip::Attachment.default_options[:s3_permissions] = 'public-read' Paperclip::Attachment.default_options[:s3_region] = ENV.fetch('S3_REGION') { 'us-east-1' }