Merge branch 'develop' into global-status-expiration

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 2cd741213da5394e8ba320c33649801c11cfc73d..c976691fbfb7a5d5f849565fe03e0eb033e6035b 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -365,6 +365,8 @@ config :pleroma, :mrf_keyword,
 
 config :pleroma, :mrf_subchain, match_actor: %{}
 
+config :pleroma, :mrf_activity_expiration, days: 365
+
 config :pleroma, :mrf_vocabulary,
   accept: [],
   reject: []
@@ -504,10 +506,6 @@ config :pleroma, :workers,
     federator_outgoing: 5
   ]
 
-config :pleroma, :fetch_initial_posts,
-  enabled: false,
-  pages: 5
-
 config :auto_linker,
   opts: [
     extra: true,