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

diff --git a/config/config.exs b/config/config.exs
index 28335a6d4..e6c695215 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -27,7 +27,8 @@ 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
@@ -40,8 +41,9 @@ 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: ""
+  proxy_url: nil
 
 config :pleroma, :instance,
   version: version,
@@ -55,6 +57,9 @@ config :pleroma, :media_proxy,
   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"