e4ceaf65 - gitea

Authored by: wxiaoguang
Authored at: 2022-06-19 03:23:06 +0800
Committed by: GitHub
Committed at: 2022-06-18 15:23:06 -0400
Signature: View
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJiriYaCRBK7hj4Ov3rIwAAwbUIAHtSrsqptlk5qIBa5F9Bvlmf t9oCJbT0+fQOUSowQR4DSuhZ0RKYbLWYr59sl9sLPRyDmSNtIBBre6Kc71jKhJZT MoSLyDAKiXBtUQZwpaFbFWNGzT1mfLSDqd7z65ABFpK7UqHbzBXlz6PRceqw2w5v Gxk27/xOsV5gEvetDQiuK/JrYbqQt//UG3ep8dbOPcxHz28BKKVN0ofF061KRBIN tYS96N9x6f9VpY/CYdbe9ol2TjZ1GdJ2vzyBQwmsR599rosC0OTi9AM46u7tCBdc DLS0NX9aMmwI6urrqdR7ZMJSIZ8a0GcmZz5JSE/TntJu9GF7UzB3B7JaJ6xWGPM= =YS3J -----END PGP SIGNATURE-----
Object name: e4ceaf65fbf626a7ccb97c0ee5a0108ea143b584
Parent: 439ace60

Update document to clarify that ALLOWED_DOMAINS/BLOCKED_DOMAINS support wildcard (#20016)

Changes

2 changed files (+4/-2)

custom/conf/app.example.ini
- @@ -2231,10 +2231,12 @@ PATH =
  ;; ;; Allowed domains for migrating, default is blank. Blank means everything will be allowed. ;; Multiple domains could be separated by commas. + ;; Wildcard is supported: "github.com, *.github.com" ;ALLOWED_DOMAINS = ;; ;; Blocklist for migrating, default is blank. Multiple domains could be separated by commas. ;; When ALLOWED_DOMAINS is not blank, this option has a higher priority to deny domains. + ;; Wildcard is supported. ;BLOCKED_DOMAINS = ;; ;; Allow private addresses defined by RFC 1918, RFC 1122, RFC 4632 and RFC 4291 (false by default)
docs/content/doc/advanced/config-cheat-sheet.en-us.md
- @@ -1081,8 +1081,8 @@ Task queue configuration has been moved to `queue.task`. However, the below conf
  - `MAX_ATTEMPTS`: **3**: Max attempts per http/https request on migrations. - `RETRY_BACKOFF`: **3**: Backoff time per http/https request retry (seconds) - - `ALLOWED_DOMAINS`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas. - - `BLOCKED_DOMAINS`: **\<empty\>**: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWED_DOMAINS` is not blank, this option has a higher priority to deny domains. + - `ALLOWED_DOMAINS`: **\<empty\>**: Domains allowlist for migrating repositories, default is blank. It means everything will be allowed. Multiple domains could be separated by commas. Wildcard is supported: `github.com, *.github.com`. + - `BLOCKED_DOMAINS`: **\<empty\>**: Domains blocklist for migrating repositories, default is blank. Multiple domains could be separated by commas. When `ALLOWED_DOMAINS` is not blank, this option has a higher priority to deny domains. Wildcard is supported. - `ALLOW_LOCALNETWORKS`: **false**: Allow private addresses defined by RFC 1918, RFC 1122, RFC 4632 and RFC 4291 - `SKIP_TLS_VERIFY`: **false**: Allow skip tls verify