diff options
| -rw-r--r-- | config/environments/production.rb | 2 | ||||
| -rw-r--r-- | 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 e5cb01151..09b77654f 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 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 |