Merge branch 'main' into glitch-soc/merge-upstream

2022-08-25 05:07:39 +02:00
parent 5a3d09dc8e 861b35dd54
commit 2d1d4210f9
67 changed files with 1420 additions and 194 deletions
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@ -47,7 +47,7 @@ Rails.application.configure do
  config.force_ssl = true
  config.ssl_options = {
    redirect: {
-      exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') }
+      exclude: -> request { request.path.start_with?('/health') || request.headers["Host"].end_with?('.onion') || request.headers["Host"].end_with?('.i2p') }
    }
  }