summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-09-16 17:03:37 +0700
committerAriadne Conill <ariadne@dereferenced.org>2019-10-04 16:01:31 +0000
commit7d5f20b50f299c96ccb12c7dd0fdae10c3f8d9c0 (patch)
treebb293c6a2089da2f8845d36c5f60e5a916c9aecc /config
parenta553ed542774891b6b0b7a57372a2c0300bbe2ba (diff)
downloadpleroma-7d5f20b50f299c96ccb12c7dd0fdae10c3f8d9c0.tar.gz
pleroma-7d5f20b50f299c96ccb12c7dd0fdae10c3f8d9c0.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 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