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 | |
| parent | 29da56cf75c1381b31a8b26738a94eff482f8099 (diff) | |
| download | mastodon-2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6.tar mastodon-2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6.tar.gz mastodon-2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6.tar.bz2 mastodon-2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6.zip | |
Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)
Still check for S3_CLOUDFRONT_HOST for existing installs.
| -rw-r--r-- | .env.nanobox | 4 | ||||
| -rw-r--r-- | .env.production.sample | 4 | ||||
| -rw-r--r-- | config/initializers/paperclip.rb | 4 | ||||
| -rw-r--r-- | config/webpack/production.js | 4 | ||||
| -rw-r--r-- | lib/tasks/mastodon.rake | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.env.nanobox b/.env.nanobox index 8e0af6a8a..b60b6ee68 100644 --- a/.env.nanobox +++ b/.env.nanobox @@ -136,8 +136,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io # Defaults to 60 seconds. Set to 0 to disable # SWIFT_CACHE_TTL= -# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front -# S3_CLOUDFRONT_HOST= +# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare) +# S3_ALIAS_HOST= # Streaming API integration # STREAMING_API_BASE_URL= diff --git a/.env.production.sample b/.env.production.sample index 349daedd8..d1164efdc 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -134,8 +134,8 @@ SMTP_FROM_ADDRESS=notifications@example.com # Defaults to 60 seconds. Set to 0 to disable # SWIFT_CACHE_TTL= -# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front -# S3_CLOUDFRONT_HOST= +# Optional alias for S3 (e.g. to serve files on a custom domain, possibly using Cloudfront or Cloudflare) +# S3_ALIAS_HOST= # Streaming API integration # STREAMING_API_BASE_URL= 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`; } diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake index 9ce39335d..519c21785 100644 --- a/lib/tasks/mastodon.rake +++ b/lib/tasks/mastodon.rake @@ -222,7 +222,7 @@ namespace :mastodon do end if prompt.yes?('Do you want to access the uploaded files from your own domain?') - env['S3_CLOUDFRONT_HOST'] = prompt.ask('Domain for uploaded files:') do |q| + env['S3_ALIAS_HOST'] = prompt.ask('Domain for uploaded files:') do |q| q.required true q.default "files.#{env['LOCAL_DOMAIN']}" q.modify :strip |