diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-30 19:01:57 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-30 19:01:57 +0000 |
| commit | bd5086731ead7399924986392e03d1974986403a (patch) | |
| tree | bf21b53379c03e09b32ec7a6c964c58a84d1f00f /config | |
| parent | 6fe01a3234cd182803e5bc9611a0ef14aa0ca737 (diff) | |
| parent | 4aff4efa8d53988d00381b1346241359cf787e87 (diff) | |
| download | pleroma-bd5086731ead7399924986392e03d1974986403a.tar.gz pleroma-bd5086731ead7399924986392e03d1974986403a.zip | |
Merge branch 'multiple-hackney-pools' into 'develop'
Use multiple hackney pools
See merge request pleroma/pleroma!739
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 1180a50bc..4dc7a62d7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -15,6 +15,20 @@ config :pleroma, Pleroma.Captcha, seconds_valid: 60, method: Pleroma.Captcha.Kocaptcha +config :pleroma, :hackney_pools, + federation: [ + max_connections: 50, + timeout: 150_000 + ], + media: [ + max_connections: 50, + timeout: 150_000 + ], + upload: [ + max_connections: 25, + timeout: 300_000 + ] + config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch" # Upload configuration @@ -22,7 +36,14 @@ config :pleroma, Pleroma.Upload, uploader: Pleroma.Uploaders.Local, filters: [], proxy_remote: false, - proxy_opts: [] + proxy_opts: [ + redirect_on_failure: false, + max_body_length: 25 * 1_048_576, + http: [ + follow_redirect: true, + pool: :upload + ] + ] config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads" @@ -214,7 +235,16 @@ config :pleroma, :mrf_simple, reject: [], accept: [] -config :pleroma, :media_proxy, enabled: false +config :pleroma, :media_proxy, + enabled: false, + proxy_opts: [ + redirect_on_failure: false, + max_body_length: 25 * 1_048_576, + http: [ + follow_redirect: true, + pool: :media + ] + ] config :pleroma, :chat, enabled: true |