diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-01-30 08:16:31 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-01-30 08:16:31 +0000 |
| commit | 2f23ae5b684a363b6090a45c4b1b9685c9ed614a (patch) | |
| tree | ab91ff8fbb1101d05378a5e0e3e6156dce9ae68c /config | |
| parent | 189e9d63bc462fe5c0f97d70ffd4bac54aeeae05 (diff) | |
| parent | 066fe1a697286e38c9e9ef7f2c273c4e7a50ffdc (diff) | |
| download | pleroma-2f23ae5b684a363b6090a45c4b1b9685c9ed614a.tar.gz pleroma-2f23ae5b684a363b6090a45c4b1b9685c9ed614a.zip | |
Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy
See merge request pleroma/pleroma!43
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 503ce8d64..e71d5e5a0 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,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", |