summaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-11-26 00:25:43 +0900
committerMaxim Filippov <colixer@gmail.com>2019-11-26 00:25:43 +0900
commitb62be2564c1b3e33e51628e980c5d1ebe259475f (patch)
tree2c3664c743e03027ccc73fd10d43c0c7acd3fbc8 /docs/configuration/cheatsheet.md
parentb3b4e5ca805780f278b6239973d6d497b1697fbd (diff)
parentdc9090810dbed74da91f2e94f23e5512d259e4fc (diff)
downloadpleroma-b62be2564c1b3e33e51628e980c5d1ebe259475f.tar.gz
pleroma-b62be2564c1b3e33e51628e980c5d1ebe259475f.zip
Merge branch 'develop' into feature/admin-api-render-whole-status
Diffstat (limited to 'docs/configuration/cheatsheet.md')
-rw-r--r--docs/configuration/cheatsheet.md12
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.