From d18d6c29f38cb9830b900ed1e7068518f41b9b26 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 17 Apr 2020 15:14:24 +0200
Subject: [PATCH] Fix search not working due to proxy settings when using
 hidden services (#13488)

Fix #13484
---
 config/initializers/chewy.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 9ff0dccc1b..18d2f18c1f 100644
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@@ -23,3 +23,9 @@ module Chewy
     end
   end
 end
+
+# ElasticSearch uses Faraday internally. Faraday interprets the
+# http_proxy env variable by default which leads to issues when
+# Mastodon is run with hidden services enabled, because
+# ElasticSearch is *not* supposed to be accessed through a proxy
+Faraday.ignore_env_proxy = true
-- 
GitLab