diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-09-16 10:59:44 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-09-16 10:59:44 +0000 |
| commit | 409e701ab849475c81073d80a973487d67cadaae (patch) | |
| tree | 7d14925ffdc67390377efd5ece22304e71ced360 /config | |
| parent | 4397a3fe4ac932a055901622b3c30a319997df6c (diff) | |
| parent | 96816ceaa25c21cec7677e75dcddd7ffb42d83c3 (diff) | |
| download | pleroma-409e701ab849475c81073d80a973487d67cadaae.tar.gz pleroma-409e701ab849475c81073d80a973487d67cadaae.zip | |
Merge branch 'fix/develop' into 'develop'
Add "Streamer refactoring" back to `develop`
See merge request pleroma/pleroma!1675
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 4 |
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 |
