about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
authornightpool <eg1290@gmail.com>2017-12-21 19:17:59 -0600
committerEugen Rochko <eugen@zeonfederated.com>2017-12-22 02:17:59 +0100
commit9592b5e31e19ce470252ade7b8df73625e2592e6 (patch)
treecb336e94f5328daab42b5952d20e6178d7af14e4 /config/initializers
parentcea98e0c12759528d4a17f59c0e7616b7d426c8c (diff)
enforce LOCAL_HTTPS=true in production (#6061)
* enforce https in production

* note changes in production env sample

* typo fix
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