about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2017-12-22 04:17:14 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2017-12-22 04:17:14 +0000
commit6d00ca1c718e32ff3e4106cd06042f047c24e908 (patch)
tree8cb59949c9de424ac0b9496a3bf0ec1db480450e /config/initializers
parent4a7782d5c98f830f5ef65a52f176d94bef53b7fc (diff)
parent9592b5e31e19ce470252ade7b8df73625e2592e6 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/ostatus.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index bb8591f74..5773b7290 100644
--- 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