diff options
| author | Roger Braun <roger@rogerbraun.net> | 2018-01-30 12:21:05 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2018-01-30 12:21:05 +0100 |
| commit | 5e37adedfb718264fbc3eb3353ccee5244e82a89 (patch) | |
| tree | d509572f7428c641ef148867a3ea6ebfe12bdd33 /config/config.exs | |
| parent | ad0ab3a57bc5591806cae0201d8077ffb10b6634 (diff) | |
| parent | 2f23ae5b684a363b6090a45c4b1b9685c9ed614a (diff) | |
| download | pleroma-5e37adedfb718264fbc3eb3353ccee5244e82a89.tar.gz pleroma-5e37adedfb718264fbc3eb3353ccee5244e82a89.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'config/config.exs')
| -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", |