diff options
| author | Jeff Becker <jeff@i2p.rocks> | 2017-12-30 11:35:53 -0500 |
|---|---|---|
| committer | Jeff Becker <jeff@i2p.rocks> | 2017-12-30 13:08:36 -0500 |
| commit | 5ddd15d794bc8f9be3ca073589bab1f92b001cce (patch) | |
| tree | 5b92b9669386feec0304a75c26f93f9e9bd5d34c | |
| parent | 5c09d8d3f199a3f323471f9ba4578371226cd726 (diff) | |
| download | pleroma-5ddd15d794bc8f9be3ca073589bab1f92b001cce.tar.gz pleroma-5ddd15d794bc8f9be3ca073589bab1f92b001cce.zip | |
make httppoison use configurable http proxy
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | lib/pleroma/http/http.ex | 14 |
2 files changed, 18 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 503ce8d64..28335a6d4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -32,7 +32,7 @@ config :mime, :types, %{ config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :ostatus, Pleroma.Web.OStatus -config :pleroma, :httpoison, HTTPoison +config :pleroma, :httpoison, Pleroma.HTTP version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do "Pleroma #{String.trim(version)}" @@ -40,6 +40,9 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do _ -> "Pleroma dev" end +config :pleroma, :http, + proxy_url: "" + config :pleroma, :instance, version: version, name: "Pleroma", diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex new file mode 100644 index 000000000..31135411c --- /dev/null +++ b/lib/pleroma/http/http.ex @@ -0,0 +1,14 @@ + +defmodule Pleroma.HTTP do + use HTTPoison.Base + + def process_request_options(options) do + config = Application.get_env(:pleroma, :http, []) + proxy = Keyword.get(config, :proxy_url, "") + case proxy do + "" -> options + _ -> options ++ [proxy: proxy] + end + end + +end |