Merge branch 'feature/locked-accounts-part-1' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 660ba17755413cb21ff5c3dcf5a572cd80b95308..3292bf29c6d83b1ef3c57969ee2bbdc48b8332b8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -53,7 +53,17 @@ config :pleroma, :instance,
   upload_limit: 16_000_000,
   registrations_open: true,
   federating: true,
-  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
+  rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+  public: true,
+  quarantined_instances: []
+
+config :pleroma, :activitypub, accept_blocks: true
+
+config :pleroma, :mrf_simple,
+  media_removal: [],
+  media_nsfw: [],
+  federated_timeline_removal: [],
+  reject: []
 
 config :pleroma, :media_proxy,
   enabled: false,