summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-10-06 15:47:11 -0500
committerMark Felder <feld@FreeBSD.org>2020-10-06 15:47:11 -0500
commit7aff2b47c56c5b41620445b7d49c429eb1866164 (patch)
treea2f943cad3901ab972879827bbf7aa3f2e3be7f3
parent35ee759e74d0737598311d8e4245168f981812d3 (diff)
Fix docs for default headers used by RemoteIp. We only use X-Forwarded-For by default.
-rw-r--r--config/description.exs5
-rw-r--r--docs/configuration/cheatsheet.md2
2 files changed, 4 insertions, 3 deletions
diff --git a/config/description.exs b/config/description.exs
index ac3dfbb2b..f6331dd30 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -3262,8 +3262,9 @@ config :pleroma, :config_description, [
%{
key: :headers,
type: {:list, :string},
- description:
- "A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Order does not matter. Default: `~w[forwarded x-forwarded-for x-client-ip x-real-ip]`."
+ description: """
+ A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Default: `["x-forwarded-for"]`.
+ """
},
%{
key: :proxies,
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 42e5fe808..e0194525d 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -426,7 +426,7 @@ This will make Pleroma listen on `127.0.0.1` port `8080` and generate urls start
Available options:
* `enabled` - Enable/disable the plug. Defaults to `false`.
-* `headers` - A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Order does not matter. Defaults to `["x-forwarded-for"]`.
+* `headers` - A list of strings naming the `req_headers` to use when deriving the `remote_ip`. Defaults to `["x-forwarded-for"]`.
* `proxies` - A list of strings in [CIDR](https://en.wikipedia.org/wiki/CIDR) notation specifying the IPs of known proxies. Defaults to `[]`.
* `reserved` - Defaults to [localhost](https://en.wikipedia.org/wiki/Localhost) and [private network](https://en.wikipedia.org/wiki/Private_network).