about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-04 14:04:26 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-04 14:04:26 +0200
commit1022d682dc915bcbf3076c0280f29472068830bb (patch)
tree6ede8a3c1cb66e175efcd56af347dc2931806284 /config
parent7939a216ff5cc7ac6bb30e850a21355f04fdebe5 (diff)
Normalized data in Redux, fix for asset URLs when rendered outside request
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ostatus.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 6aada2c32..72009334f 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -1,9 +1,9 @@
 Rails.application.configure do
-  config.x.local_domain = ENV['LOCAL_DOMAIN'] || 'localhost'
+  config.x.local_domain = ENV['LOCAL_DOMAIN'] || "localhost:#{ENV['PORT'] || 3000}"
   config.x.hub_url      = ENV['HUB_URL']      || 'https://pubsubhubbub.superfeedr.com'
   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://', trailing_slash: false }
 
   if Rails.env.production?
     config.action_cable.allowed_request_origins = ["http#{config.x.use_https ? 's' : ''}://#{config.x.local_domain}"]