Skip to content
Snippets Groups Projects
Unverified Commit 5ddd15d7 authored by jeff's avatar jeff
Browse files

make httppoison use configurable http proxy

parent 5c09d8d3
Branches
Tags
No related merge requests found
......@@ -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",
......
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment