diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:30:33 +0200 |
|---|---|---|
| committer | ArthurHoaro <arthur@hoa.ro> | 2019-07-27 12:30:33 +0200 |
| commit | 1b8ed48a0d3964186f4d66d443783f4d250e7147 (patch) | |
| tree | 23597f312507ba0c1b461755b9aa086106374a4d /doc/md/Server-configuration.md | |
| parent | 1aa24ed8d2974cda98733f74b36844b02942cc11 (diff) | |
| parent | ed3365325d231e044dedc32608fde87b1b39fa34 (diff) | |
| download | Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.tar.gz Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.tar.zst Shaarli-1b8ed48a0d3964186f4d66d443783f4d250e7147.zip | |
Merge tag 'v0.11.0' into latest
Release v0.11.0
Diffstat (limited to 'doc/md/Server-configuration.md')
| -rw-r--r-- | doc/md/Server-configuration.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/md/Server-configuration.md b/doc/md/Server-configuration.md index 78083a46..88eed8e6 100644 --- a/doc/md/Server-configuration.md +++ b/doc/md/Server-configuration.md | |||
| @@ -17,7 +17,7 @@ Version | Status | Shaarli compatibility | |||
| 17 | :---:|:---:|:---: | 17 | :---:|:---:|:---: |
| 18 | 7.2 | Supported | Yes | 18 | 7.2 | Supported | Yes |
| 19 | 7.1 | Supported | Yes | 19 | 7.1 | Supported | Yes |
| 20 | 7.0 | Supported | Yes | 20 | 7.0 | EOL: 2018-12-03 | Yes (up to Shaarli 0.10.x) |
| 21 | 5.6 | EOL: 2018-12-31 | Yes (up to Shaarli 0.10.x) | 21 | 5.6 | EOL: 2018-12-31 | Yes (up to Shaarli 0.10.x) |
| 22 | 5.5 | EOL: 2016-07-10 | Yes | 22 | 5.5 | EOL: 2016-07-10 | Yes |
| 23 | 5.4 | EOL: 2015-09-14 | Yes (up to Shaarli 0.8.x) | 23 | 5.4 | EOL: 2015-09-14 | Yes (up to Shaarli 0.8.x) |
| @@ -404,6 +404,8 @@ If Shaarli is served behind a proxy (i.e. there is a proxy server between client | |||
| 404 | - `X-Forwarded-Host` | 404 | - `X-Forwarded-Host` |
| 405 | - `X-Forwarded-For` | 405 | - `X-Forwarded-For` |
| 406 | 406 | ||
| 407 | In you [Shaarli configuration](Shaarli-configuration) `data/config.json.php`, add the public IP of your proxy under `security.trusted_proxies`. | ||
| 408 | |||
| 407 | See also [proxy-related](https://github.com/shaarli/Shaarli/issues?utf8=%E2%9C%93&q=label%3Aproxy+) issues. | 409 | See also [proxy-related](https://github.com/shaarli/Shaarli/issues?utf8=%E2%9C%93&q=label%3Aproxy+) issues. |
| 408 | 410 | ||
| 409 | ## Robots and crawlers | 411 | ## Robots and crawlers |