mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-29 08:37:14 +00:00
Fix URL configuration when S3 is enabled
This commit is contained in:
parent
45230c56ab
commit
d14967e1c8
|
@ -10,6 +10,6 @@ module RoutingHelper
|
|||
end
|
||||
|
||||
def full_asset_url(source)
|
||||
File.join(root_url, ActionController::Base.helpers.asset_url(source))
|
||||
Rails.configuration.x.use_s3 ? source : File.join(root_url, ActionController::Base.helpers.asset_url(source))
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,6 +2,7 @@ Rails.application.configure do
|
|||
config.x.local_domain = ENV['LOCAL_DOMAIN'] || "localhost:#{ENV['PORT'] || 3000}"
|
||||
config.x.hub_url = ENV['HUB_URL'] || 'https://pubsubhubbub.superfeedr.com'
|
||||
config.x.use_https = ENV['LOCAL_HTTPS'] == 'true'
|
||||
config.x.use_s3 = ENV['S3_ENABLED'] == 'true'
|
||||
|
||||
config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://', trailing_slash: false }
|
||||
|
||||
|
|
Loading…
Reference in a new issue