hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'pr-upstream-http-proxy' into 'develop'

Browse source 
Pr upstream http proxy

See merge request pleroma/pleroma!43
This commit is contained in:
lambda 2018-01-30 08:16:31 +00:00
commit 2f23ae5b68
4 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/config.exs
View file

@ -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,10 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
_ -> "Pleroma dev"
end
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
proxy_url: nil
config :pleroma, :instance,
version: version,
name: "Pleroma",