diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2023-01-03 14:05:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-03 14:05:25 +0100 |
| commit | b956b0e8c083104b5336f574aea61068e2616bd2 (patch) | |
| tree | f4351db872eb14ac0c36cdb5ef22095f290a59db | |
| parent | 961dcdd255f3108a642dfe0ede87b1a536f0cef1 (diff) | |
| parent | a1fef7bbe4d7f9e7d85f29a5eac57fce31b62e11 (diff) | |
| download | nextcloud-server-b956b0e8c083104b5336f574aea61068e2616bd2.tar.gz nextcloud-server-b956b0e8c083104b5336f574aea61068e2616bd2.zip | |
Merge pull request #35956 from nextcloud/docs/ipv6-cidr
docs: trusted_proxies support IPv6 ranges
| -rw-r--r-- | config/config.sample.php | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index a2976ed1a7b..4597ce9a77d 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -2027,9 +2027,7 @@ $CONFIG = [ * - IPv4 addresses, e.g. `192.168.2.123` * - IPv4 ranges in CIDR notation, e.g. `192.168.2.0/24` * - IPv6 addresses, e.g. `fd9e:21a7:a92c:2323::1` - * - * _(CIDR notation for IPv6 is currently work in progress and thus not - * available yet)_ + * - IPv6 ranges in CIDR notation, e.g. `2001:db8:85a3:8d3:1319:8a20::/95` * * When an incoming request's `REMOTE_ADDR` matches any of the IP addresses * specified here, it is assumed to be a proxy instead of a client. Thus, the @@ -2288,9 +2286,9 @@ $CONFIG = [ * * For instance, if the phone property should default to the private scope * instead of the local one: - * + * * :: - * + * * [ * \OCP\Accounts\IAccountManager::PROPERTY_PHONE => \OCP\Accounts\IAccountManager::SCOPE_PRIVATE * ] |