Respect proxy settings federation

2019-05-28 06:49:53 +00:00 · 2019-05-28 06:49:53 +00:00 · 9f3bcf0efe
parent 5bb843ceec
commit 9f3bcf0efe
1 changed files with 2 additions and 0 deletions
--- a/lib/pleroma/http/connection.ex
+++ b/lib/pleroma/http/connection.ex
@ -32,9 +32,11 @@ def new(opts \\ []) 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