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/webpack | |
parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
parent | be20eb4b2f4e55c472263a98a2c07b4e805d9bd5 (diff) |
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/webpack')
-rw-r--r-- | config/webpack/production.js | 4 |
1 files changed, 2 insertions, 2 deletions
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`; } |