diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-17 20:16:24 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-17 20:16:24 +0200 |
| commit | 81e49ba5c6107927d12bd222b7081f63ba63bdc9 (patch) | |
| tree | d88e34d9a103f23b7ab568e92bd9b2e6ab679a47 /config/initializers | |
| parent | 5fdd5eef5a6b05b072a57e065954fdcb0b4a8898 (diff) | |
| parent | 89077fb65713ece348fdbee1986d1593383ba801 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/chewy.rb | 6 |
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 |