Explorar el Código

make httppoison use configurable http proxy

tags/v0.9.9
Jeff Becker hace 6 años
padre
commit
5ddd15d794
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: F357B3B42F6F9B05
Se han modificado 2 ficheros con 18 adiciones y 1 borrados
  1. +4
    -1
      config/config.exs
  2. +14
    -0
      lib/pleroma/http/http.ex

+ 4
- 1
config/config.exs Ver fichero

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


+ 14
- 0
lib/pleroma/http/http.ex Ver fichero

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

Cargando…
Cancelar
Guardar