Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-22 04:17:14 +00:00
parent 4a7782d5c9 9592b5e31e
commit 6d00ca1c71
4 changed files with 24 additions and 13 deletions
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@ -3,11 +3,12 @@
 port     = ENV.fetch('PORT') { 3000 }
 host     = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" }
 web_host = ENV.fetch('WEB_DOMAIN') { host }
-https    = ENV['LOCAL_HTTPS'] == 'true'

 alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }

 Rails.application.configure do
+  https    = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
+
  config.x.local_domain = host
  config.x.web_domain   = web_host
  config.x.use_https    = https