Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index cf8d6c2b741d4a5d5bf2667f665ce277b442e2e7..b0f4578d5e537b27c62c3ce1a0f83c7a0d27fc8f 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -27,7 +27,8 @@ config :logger, :console,
 
 config :mime, :types, %{
   "application/xrd+xml" => ["xrd+xml"],
-  "application/activity+json" => ["activity+json"]
+  "application/activity+json" => ["activity+json"],
+  "application/ld+json" => ["activity+json"]
 }
 
 config :pleroma, :websub, Pleroma.Web.Websub
@@ -51,7 +52,14 @@ config :pleroma, :instance,
   limit: 5000,
   upload_limit: 16_000_000,
   registrations_open: true,
-  federating: true
+  federating: true,
+  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
+
+config :pleroma, :mrf_simple,
+  media_removal: [],
+  media_nsfw: [],
+  federated_timeline_removal: [],
+  reject: []
 
 config :pleroma, :media_proxy,
   enabled: false,