about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>2017-05-04 22:55:13 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-05-04 15:55:13 +0200
commit0cdcf328657c4a827be2dca9d8614ccbf55045ed (patch)
tree84b8a088af1c4a6e57d1962ed8e66531a2f3652c /config
parent629a4d0fcac303a66b92d745e159a5913a38fa78 (diff)
Use ws protocol in streaming API base URL (#2606)
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ostatus.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index a905a032c..0c6e88f31 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -12,9 +12,9 @@ Rails.application.configure do
   config.x.use_s3       = ENV['S3_ENABLED'] == 'true'
 
   config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false }
-  config.x.streaming_api_base_url          = 'http://localhost:4000'
+  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') { "http#{https ? 's' : ''}://#{web_host}" }
+    config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" }
   end
 end