logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 290ffb63cdf4753bc30224619f182cc3db654e91
parent: d3bd10dfe47e2273c4572da33c552900c42cea30
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Sat,  3 Dec 2016 22:12:22 +0100

Fix cloudfront config

Diffstat:

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

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb @@ -7,7 +7,7 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:s3_host_name] = "s3-#{ENV.fetch('S3_REGION')}.amazonaws.com" Paperclip::Attachment.default_options[:path] = '/:class/:attachment/:id_partition/:style/:filename' - if ENV['S3_CLOUDFRONT_HOST'] == '' + unless ENV['S3_CLOUDFRONT_HOST'].blank? Paperclip::Attachment.default_options[:url] = ':s3_alias_url' Paperclip::Attachment.default_options[:s3_host_alias] = ENV['S3_CLOUDFRONT_HOST'] end