Respect proxy settings federation

diff --git a/lib/pleroma/http/connection.ex b/lib/pleroma/http/connection.ex
index 558005c19260e96cee699783847c17c1980ea884..c216cdcb11af5875d47e602b25fa327d07f88614 100644 (file)
--- 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