diff options
| author | jeff <jeff@i2p.rocks> | 2019-05-28 06:49:53 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-05-28 06:49:53 +0000 |
| commit | 9f3bcf0efe7fa06e2b8970386c099c1ea2974d0a (patch) | |
| tree | c5403dc6c976c03674274580bb55f4e3591f08ec | |
| parent | 5bb843ceece57cd88e8615b4a4519d2b40309295 (diff) | |
| download | pleroma-9f3bcf0efe7fa06e2b8970386c099c1ea2974d0a.tar.gz | |
Respect proxy settings federation
| -rw-r--r-- | lib/pleroma/http/connection.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex index 558005c19..c216cdcb1 100644 --- a/lib/pleroma/http/connection.ex +++ b/lib/pleroma/http/connection.ex @@ -32,9 +32,11 @@ defmodule Pleroma.HTTP.Connection do defp hackney_options(opts) do options = Keyword.get(opts, :adapter, []) adapter_options = Pleroma.Config.get([:http, :adapter], []) + proxy_url = Pleroma.Config.get([:http, :proxy_url], nil) @hackney_options |> Keyword.merge(adapter_options) |> Keyword.merge(options) + |> Keyword.merge(proxy: proxy_url) end end |