summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-07-09 14:15:10 +0000
committerrinpatch <rinpatch@sdf.org>2019-07-09 14:15:10 +0000
commit376a55c97fcf178abec3091db830215642bf23c1 (patch)
treecd4c52fb36c8f89092b8bad38b3923b711bfc2b2 /config
parent8574ebfc120efc2121e3bd488b1e80ae78241328 (diff)
parentdd5a41e2a4312a3dc7a1083d3d0ac5b356afafa8 (diff)
downloadpleroma-376a55c97fcf178abec3091db830215642bf23c1.tar.gz
pleroma-376a55c97fcf178abec3091db830215642bf23c1.zip
Merge branch '161-incoming-replies-depth-limit' into 'develop'
[#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361
Diffstat (limited to 'config')
-rw-r--r--config/config.exs1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index e337f00aa..65f239e31 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -218,6 +218,7 @@ config :pleroma, :instance,
},
registrations_open: true,
federating: true,
+ federation_incoming_replies_max_depth: 100,
federation_reachability_timeout_days: 7,
federation_publisher_modules: [
Pleroma.Web.ActivityPub.Publisher,