summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-09-16 17:03:37 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-09-16 17:55:04 +0700
commit96816ceaa25c21cec7677e75dcddd7ffb42d83c3 (patch)
tree7d14925ffdc67390377efd5ece22304e71ced360 /config
parent4397a3fe4ac932a055901622b3c30a319997df6c (diff)
downloadpleroma-96816ceaa25c21cec7677e75dcddd7ffb42d83c3.tar.gz
pleroma-96816ceaa25c21cec7677e75dcddd7ffb42d83c3.zip
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index ab6e00c98..b1b98af93 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -331,6 +331,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