Still check for S3_CLOUDFRONT_HOST for existing installs.master
@@ -136,8 +136,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io | |||||
# Defaults to 60 seconds. Set to 0 to disable | # Defaults to 60 seconds. Set to 0 to disable | ||||
# SWIFT_CACHE_TTL= | # 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 integration | ||||
# STREAMING_API_BASE_URL= | # STREAMING_API_BASE_URL= | ||||
@@ -134,8 +134,8 @@ SMTP_FROM_ADDRESS=notifications@example.com | |||||
# Defaults to 60 seconds. Set to 0 to disable | # Defaults to 60 seconds. Set to 0 to disable | ||||
# SWIFT_CACHE_TTL= | # 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 integration | ||||
# STREAMING_API_BASE_URL= | # STREAMING_API_BASE_URL= | ||||
@@ -47,10 +47,10 @@ if ENV['S3_ENABLED'] == 'true' | |||||
Paperclip::Attachment.default_options[:url] = ':s3_path_url' | Paperclip::Attachment.default_options[:url] = ':s3_path_url' | ||||
end | 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!( | Paperclip::Attachment.default_options.merge!( | ||||
url: ':s3_alias_url', | url: ':s3_alias_url', | ||||
s3_host_alias: ENV['S3_CLOUDFRONT_HOST'] | |||||
s3_host_alias: ENV['S3_ALIAS_HOST'] || ENV['S3_CLOUDFRONT_HOST'] | |||||
) | ) | ||||
end | end | ||||
elsif ENV['SWIFT_ENABLED'] == 'true' | elsif ENV['SWIFT_ENABLED'] == 'true' | ||||
@@ -23,8 +23,8 @@ try { | |||||
let attachmentHost; | let attachmentHost; | ||||
if (process.env.S3_ENABLED === 'true') { | 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 { | } else { | ||||
attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`; | attachmentHost = process.env.S3_HOSTNAME || `s3-${process.env.S3_REGION || 'us-east-1'}.amazonaws.com`; | ||||
} | } | ||||
@@ -222,7 +222,7 @@ namespace :mastodon do | |||||
end | end | ||||
if prompt.yes?('Do you want to access the uploaded files from your own domain?') | 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.required true | ||||
q.default "files.#{env['LOCAL_DOMAIN']}" | q.default "files.#{env['LOCAL_DOMAIN']}" | ||||
q.modify :strip | q.modify :strip | ||||