Browse Source

Final fix for ActionCable origin issues

pull/4/head
Eugen Rochko 6 years ago
parent
commit
68c93f8b85
2 changed files with 4 additions and 2 deletions
  1. +0
    -2
      config/environments/production.rb
  2. +4
    -0
      config/initializers/ostatus.rb

+ 0
- 2
config/environments/production.rb View File

@ -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

+ 4
- 0
config/initializers/ostatus.rb View File

@ -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

Loading…
Cancel
Save