diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-26 10:42:36 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-11-26 10:42:36 +0300 |
| commit | c8d3c3bfeca66d16846f97b50328e0718cfe5fef (patch) | |
| tree | cfe7074c79f6117443632af5f13fd33672f90732 /docs/configuration | |
| parent | cad9b325e567c9c607c2b1d33c915cc88da716b1 (diff) | |
| parent | dc9090810dbed74da91f2e94f23e5512d259e4fc (diff) | |
| download | pleroma-c8d3c3bfeca66d16846f97b50328e0718cfe5fef.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
Diffstat (limited to 'docs/configuration')
| -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 07d9a1d45..dc2f55229 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. |