about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-08-18 18:08:25 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-08-18 18:08:25 +0200
commit5a8c149f6b928b0463adf77de41e6b208aacdc5c (patch)
treec37dec593cbcc969e967d8f1395121de13617bd8 /config
parent8459acd1234e9efcbf106e3eaa00ca871717d386 (diff)
Fix ActionCable origin checking
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ostatus.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 3cb17c718..056d30f49 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -4,4 +4,6 @@ Rails.application.configure do
   config.x.use_https    = ENV['LOCAL_HTTPS'] == 'true'
 
   config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://' }
+
+  config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
 end