diff options
| author | M Somerville <dracos@users.noreply.github.com> | 2018-08-25 12:27:08 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-25 13:27:08 +0200 |
| commit | 2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6 (patch) | |
| tree | 771949d55b2329a134ae798928554aadf448cef9 /config | |
| parent | 29da56cf75c1381b31a8b26738a94eff482f8099 (diff) | |
Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)
Still check for S3_CLOUDFRONT_HOST for existing installs.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/paperclip.rb | 4 | ||||
| -rw-r--r-- | config/webpack/production.js | 4 |
2 files changed, 4 insertions, 4 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' diff --git a/config/webpack/production.js b/config/webpack/production.js index 4966807a1..27a78108b 100644 --- a/config/webpack/production.js +++ b/config/webpack/production.js @@ -23,8 +23,8 @@ try { let attachmentHost; if (process.env.S3_ENABLED === 'true') { - if (process.env.S3_CLOUDFRONT_HOST) { - attachmentHost = process.env.S3_CLOUDFRONT_HOST; + if (process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST) { + attachmentHost = process.env.S3_ALIAS_HOST || process.env.S3_CLOUDFRONT_HOST; } else { attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`; } |