diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2021-11-08 11:25:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 11:25:41 +0800 |
| commit | d168f0498bfff3b251924804b6deafc267c5df65 (patch) | |
| tree | 8b4a2c760d08d680410ae717541324eebf2ada95 | |
| parent | 9d97cf3a7150d3b5eca3f4214a8435fad7fef99c (diff) | |
| download | gitea-d168f0498bfff3b251924804b6deafc267c5df65.tar.gz gitea-d168f0498bfff3b251924804b6deafc267c5df65.zip | |
Fix documents for ALLOWED_HOST_LIST, its default value differs between 1.15 and 1.16 (#17530)
* fix documents for ALLOWED_HOST_LIST, its default value differs between 1.15 and 1.16
| -rw-r--r-- | custom/conf/app.example.ini | 1 | ||||
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index eadc1c0d96..9643e396b6 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -1400,6 +1400,7 @@ PATH = ;; Built-in: loopback (for localhost), private (for LAN/intranet), external (for public hosts on internet), * (for all hosts) ;; CIDR list: 1.2.3.0/8, 2001:db8::/32 ;; Wildcard hosts: *.mydomain.com, 192.168.100.* +;; Since 1.15.7. Default to * for 1.15.x, external for 1.16 and later ;ALLOWED_HOST_LIST = external ;; ;; Allow insecure certification diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 6cc6043cae..3b5d9213df 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -581,7 +581,7 @@ Define allowed algorithms and their minimum key length (use -1 to disable a type - `QUEUE_LENGTH`: **1000**: Hook task queue length. Use caution when editing this value. - `DELIVER_TIMEOUT`: **5**: Delivery timeout (sec) for shooting webhooks. -- `ALLOWED_HOST_LIST`: **external**: Webhook can only call allowed hosts for security reasons. Comma separated list. +- `ALLOWED_HOST_LIST`: **external**: Since 1.15.7. Default to `*` for 1.15.x, `external` for 1.16 and later. Webhook can only call allowed hosts for security reasons. Comma separated list. - Built-in networks: - `loopback`: 127.0.0.0/8 for IPv4 and ::1/128 for IPv6, localhost is included. - `private`: RFC 1918 (10.0.0.0/8, 172.16.0.0/12, 192.168.0.0/16) and RFC 4193 (FC00::/7). Also called LAN/Intranet. |