X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=bd714a189bd45a999e96cd0afec6d2e2b6629534;hb=bd4926288e6b5d8d3e4439d83e30fa0211045d0b;hp=05995085c46d3fcbc4f691d9ac2d484a772a59a5;hpb=dffde6631d105949b62c1ff27c22fefcb873b2e8;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 05995085c..bd714a189 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
@@ -42,20 +43,24 @@ version = with {version, 0} <- System.cmd("git", ["rev-parse", "HEAD"]) do
 
 # Configures http settings, upstream proxy etc.
 config :pleroma, :http,
-  proxy_url: ""
+  proxy_url: nil
 
 config :pleroma, :instance,
   version: version,
   name: "Pleroma",
   email: "example@example.com",
   limit: 5000,
-  registrations_open: true
+  registrations_open: true,
+  federating: 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"