hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix URL configuration when S3 is enabled

signup-info-prompt
Eugen Rochko 2016-11-06 20:43:16 +01:00
parent 45230c56ab
commit d14967e1c8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/routing_helper.rb
View File

@ -10,6 +10,6 @@ module RoutingHelper
end end
def full_asset_url(source) 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
end end

1
config/initializers/ostatus.rb
View File

@ -2,6 +2,7 @@ Rails.application.configure do
config.x.local_domain = ENV['LOCAL_DOMAIN'] || "localhost:#{ENV['PORT'] || 3000}" config.x.local_domain = ENV['LOCAL_DOMAIN'] || "localhost:#{ENV['PORT'] || 3000}"
config.x.hub_url = ENV['HUB_URL'] || 'https://pubsubhubbub.superfeedr.com' config.x.hub_url = ENV['HUB_URL'] || 'https://pubsubhubbub.superfeedr.com'
config.x.use_https = ENV['LOCAL_HTTPS'] == 'true' 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 } config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://', trailing_slash: false }