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: [PATCH] Final fix for ActionCable origin issues
---
config/environments/production.rb | 2 --
config/initializers/ostatus.rb | 4 ++++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e5cb0115..09b77654 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -80,6 +80,4 @@ Rails.application.configure do
}
config.action_mailer.delivery_method = :smtp
-
- config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
end
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 3cb17c71..6aada2c3 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