summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-04 17:39:28 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-04 17:39:28 +0000
commitca6f1644aa72e9f3b56e57b8b6dfc0830d44648a (patch)
tree3ee414167996edf5bc39851482c7972673020147 /config/config.exs
parent222c238e7b807853dc02a79e00273b5f6b70eb4b (diff)
parentd9e0108baacbe26a2f594d6f2badec58010ff1f9 (diff)
downloadpleroma-ca6f1644aa72e9f3b56e57b8b6dfc0830d44648a.tar.gz
pleroma-ca6f1644aa72e9f3b56e57b8b6dfc0830d44648a.zip
Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
widen streaming API blocks (for 1.1) See merge request pleroma/pleroma!1785
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 0e91df886..4efadb823 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -313,6 +313,10 @@ config :pleroma, :activitypub,
follow_handshake_timeout: 500,
sign_object_fetches: true
+config :pleroma, :streamer,
+ workers: 3,
+ overflow_workers: 2
+
config :pleroma, :user, deny_follow_blocked: true
config :pleroma, :mrf_normalize_markup, scrub_policy: Pleroma.HTML.Scrubber.Default