mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-21 12:05:07 +01:00
Change streaming API URL when remote development (#5942)
* Change streaming API URL when remote development * Use STREAMING_API_BASE_URL when dev env
This commit is contained in:
parent
07b4427865
commit
6855baa0c5
@ -17,9 +17,12 @@ Rails.application.configure do
|
|||||||
config.x.alternate_domains = alternate_domains.split(/\s*,\s*/)
|
config.x.alternate_domains = alternate_domains.split(/\s*,\s*/)
|
||||||
|
|
||||||
config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false }
|
config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false }
|
||||||
config.x.streaming_api_base_url = 'ws://localhost:4000'
|
|
||||||
|
|
||||||
if Rails.env.production?
|
config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') do
|
||||||
config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" }
|
if Rails.env.production?
|
||||||
|
"ws#{https ? 's' : ''}://#{web_host}"
|
||||||
|
else
|
||||||
|
"ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user