Merge branch 'bugfix/x509-public-key' into 'develop'

[akkoma] / CONFIGURATION.md

diff --git a/CONFIGURATION.md b/CONFIGURATION.md
index 6b2821b21d125b4aa32c88157620bcff7f5d7b65..3f0ecafb5c514eaa268a8a4c40831568b80b0e91 100644 (file)
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -13,6 +13,23 @@ Instead, overload the settings by editing the following files:
 * `dev.secret.exs`: custom additional configuration for `MIX_ENV=dev`
 * `prod.secret.exs`: custom additional configuration for `MIX_ENV=prod`
 
+## Block functionality
+
+    config :pleroma, :activitypub,
+      accept_blocks: true,
+      unfollow_blocked: true,
+      outgoing_blocks: true
+
+    config :pleroma, :user, deny_follow_blocked: true
+
+* `accept_blocks`: whether to accept incoming block activities from
+   other instances
+* `unfollow_blocked`: whether blocks result in people getting
+   unfollowed
+* `outgoing_blocks`: whether to federate blocks to other instances
+* `deny_follow_blocked`: whether to disallow following an account that
+   has blocked the user in question
+
 ## Message Rewrite Filters (MRFs)
 
 Modify incoming and outgoing posts.