OpenSource/mastodon
OpenSource/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-23 02:51:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Final fix for ActionCable origin issues

Browse source
This commit is contained in:
Eugen Rochko 2016-08-18 18:51:50 +02:00
parent 8985f8e66c
commit 68c93f8b85
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/environments/production.rb
View file

@ -80,6 +80,4 @@ Rails.application.configure do
} }
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]
end end

4
config/initializers/ostatus.rb
View file

@ -4,4 +4,8 @@ Rails.application.configure do
config.x.use_https = ENV['LOCAL_HTTPS'] == 'true' 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_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 end