Skip to content

Commit

Permalink
docs: trusted_proxies support IPv6 ranges
Browse files Browse the repository at this point in the history
Support for IPv6 ranges was added by #32615

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
  • Loading branch information
kesselb committed Jan 3, 2023
1 parent 7f51c79 commit af6dcbd
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions config/config.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -669,16 +669,16 @@
* and a maximum time for trash bin retention.
*
* Minimum time is the number of days a file will be kept, after which it
* _may be_ deleted. A file may be deleted after the minimum number of days
* is expired if space is needed. The file will not be deleted if space is
* not needed.
* _may be_ deleted. A file may be deleted after the minimum number of days
* is expired if space is needed. The file will not be deleted if space is
* not needed.
*
* Whether "space is needed" depends on whether a user quota is defined or not:
*
* * If no user quota is defined, the available space on the Nextcloud data
* * If no user quota is defined, the available space on the Nextcloud data
* partition sets the limit for the trashbin
* (issues: see https://github.com/nextcloud/server/issues/28451).
* * If a user quota is defined, 50% of the user's remaining quota space sets
* * If a user quota is defined, 50% of the user's remaining quota space sets
* the limit for the trashbin.
*
* Maximum time is the number of days at which it is _guaranteed
Expand Down Expand Up @@ -847,7 +847,7 @@
'check_for_working_htaccess' => true,

/**
* In rare setups (e.g. on Openshift or docker on windows) the permissions check
* In rare setups (e.g. on Openshift or Docker on Windows) the permissions check
* might block the installation while the underlying system offers no means to
* "correct" the permissions. In this case, set the value to false.
*
Expand Down Expand Up @@ -2005,9 +2005,7 @@
* - 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 as of 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
Expand Down

0 comments on commit af6dcbd

Please sign in to comment.