diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:26:56 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-11-28 21:27:01 +0300 |
| commit | b7c449118bc09ab36610e85292d153ace67c2b89 (patch) | |
| tree | 1b00c2dec9d233ec3aaefd699aee3f4080f68119 /docs/configuration/cheatsheet.md | |
| parent | 1403a1441de36e8a58da5e996c208a9c10f65440 (diff) | |
| parent | ca1acfa314a57f78c2f5f8e60a4bd1380350e483 (diff) | |
| download | pleroma-b7c449118bc09ab36610e85292d153ace67c2b89.tar.gz | |
Merge branch 'develop' into issue/1383
Diffstat (limited to 'docs/configuration/cheatsheet.md')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index e414d0b11..78f161644 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -348,7 +348,17 @@ Available caches: * `:activity_pub` - activity pub routes (except question activities). Defaults to `nil` (no expiration). * `:activity_pub_question` - activity pub routes (question activities). Defaults to `30_000` (30 seconds). -## :hackney_pools +## HTTP client + +### :http + +* `proxy_url`: an upstream proxy to fetch posts and/or media with, (default: `nil`) +* `send_user_agent`: should we include a user agent with HTTP requests? (default: `true`) +* `user_agent`: what user agent should we use? (default: `:default`), must be string or `:default` +* `adapter`: array of hackney options + + +### :hackney_pools Advanced. Tweaks Hackney (http client) connections pools. |