From 68c93f8b859617fb6bb2dc5cf6c5f9a6362bf6a8 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 18 Aug 2016 18:51:50 +0200
Subject: Final fix for ActionCable origin issues

---
 config/initializers/ostatus.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config/initializers')

diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 3cb17c718..6aada2c32 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -4,4 +4,8 @@ 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://' }
+
+  if Rails.env.production?
+    config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
+  end
 end
-- 
cgit