squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make httppoison use configurable http proxy

Browse Source
This commit is contained in:
Jeff Becker 2017-12-30 11:35:53 -05:00
parent 5c09d8d3f1
commit 5ddd15d794
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.exs
View File

@ -32,7 +32,7 @@ config :mime, :types, %{
config :pleroma, :websub, Pleroma.Web.Websub config :pleroma, :websub, Pleroma.Web.Websub
config :pleroma, :ostatus, Pleroma.Web.OStatus 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 version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
"Pleroma #{String.trim(version)}" "Pleroma #{String.trim(version)}"
@ -40,6 +40,9 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
_ -> "Pleroma dev" _ -> "Pleroma dev"
end end
config :pleroma, :http,
proxy_url: ""
config :pleroma, :instance, config :pleroma, :instance,
version: version, version: version,
name: "Pleroma", name: "Pleroma",

14
lib/pleroma/http/http.ex Normal file
View File

@ -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