about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-04-17 15:14:24 +0200
committerGitHub <noreply@github.com>2020-04-17 15:14:24 +0200
commitd18d6c29f38cb9830b900ed1e7068518f41b9b26 (patch)
treee4ce1199617658a9fe40cb69c22d7d8b5ab3a53e /config
parentab8d7c0680d7f75826277be4c8eea1ebd396be8a (diff)
Fix search not working due to proxy settings when using hidden services (#13488)
Fix #13484
Diffstat (limited to 'config')
-rw-r--r--config/initializers/chewy.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/config/initializers/chewy.rb b/config/initializers/chewy.rb
index 9ff0dccc1..18d2f18c1 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