diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /config/initializers/ostatus.rb | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'config/initializers/ostatus.rb')
| -rw-r--r-- | config/initializers/ostatus.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index ba96fda22..bb8591f74 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -17,9 +17,12 @@ Rails.application.configure do 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.x.streaming_api_base_url = 'ws://localhost:4000' - if Rails.env.production? - config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" } + config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') do + if Rails.env.production? + "ws#{https ? 's' : ''}://#{web_host}" + else + "ws://#{ENV['REMOTE_DEV'] == 'true' ? host.split(':').first : 'localhost'}:4000" + end end end |