summaryrefslogtreecommitdiff
path: root/docs/configuration/cheatsheet.md
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-11-25 11:36:59 +0000
committerrinpatch <rinpatch@sdf.org>2019-11-25 11:36:59 +0000
commit756bdef5f5a879d6a817d833e7b9428f8c7b0c22 (patch)
treeade7a694da974f0f1b094f1f3fe87d4b0d0243fe /docs/configuration/cheatsheet.md
parent34cdbcbb644e14dde562c150fa8ae2881e6a899b (diff)
parente2dc89069d6d77a10848e53f321e2e464f539a25 (diff)
downloadpleroma-756bdef5f5a879d6a817d833e7b9428f8c7b0c22.tar.gz
pleroma-756bdef5f5a879d6a817d833e7b9428f8c7b0c22.zip
Merge branch 'feature/useragent-override' into 'develop'
Add ability to set a custom user-agent string See merge request pleroma/pleroma!2009
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.