X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=e6c695215e50b06054d089034e5ed7381c9e90cb;hb=5a371892a031ecc7359ff45d1119ae41a20f46dd;hp=c4f89c40c5433399e1fd971a6d379666e60a342c;hpb=c20530e7080e7c37f33a944933a5a84c95f0e387;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index c4f89c40c..e6c695215 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -27,12 +27,13 @@ config :logger, :console,
   metadata: [:request_id]
 
 config :mime, :types, %{
-  "application/xrd+xml" => ["xrd+xml"]
+  "application/xrd+xml" => ["xrd+xml"],
+  "application/activity+json" => ["activity+json"]
 }
 
 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 +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",
@@ -47,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"