summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs14
1 files changed, 13 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index f26f9ecdf..e6c695215 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -33,7 +33,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)}"
@@ -41,6 +41,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",
@@ -48,6 +52,14 @@ config :pleroma, :instance,
limit: 5000,
registrations_open: true
+config :pleroma, :media_proxy,
+ enabled: false,
+ redirect_on_failure: true
+ #base_url: "https://cache.pleroma.social"
+
+config :pleroma, :chat,
+ enabled: true
+
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env}.exs"