diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 19:12:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 19:12:07 +0200 |
| commit | af934b90710a2ce1099d3ceda5de7bcf0e94595c (patch) | |
| tree | 71e25690e6300d0235d515ccd0241d082c8d1abe /config/initializers | |
| parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
| parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) | |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/paperclip.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 59ab9b9a1..df0205879 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -47,10 +47,10 @@ if ENV['S3_ENABLED'] == 'true' Paperclip::Attachment.default_options[:url] = ':s3_path_url' end - if ENV.has_key?('S3_CLOUDFRONT_HOST') + if ENV.has_key?('S3_ALIAS_HOST') || ENV.has_key?('S3_CLOUDFRONT_HOST') Paperclip::Attachment.default_options.merge!( url: ':s3_alias_url', - s3_host_alias: ENV['S3_CLOUDFRONT_HOST'] + s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] ) end elsif ENV['SWIFT_ENABLED'] == 'true' |