diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-25 23:23:27 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-25 23:23:27 +0000 |
| commit | 5b2791698c7e09da6a5481f7c024ea8622e9a3c1 (patch) | |
| tree | a2b5c9a0c322ee68c363ce6c8b78c64525a0987b /docs/config.md | |
| parent | 8c9227c1f1fa9c98069b549976be5b9c4ace076e (diff) | |
| parent | 24c3e2db2c6846073df80c124633dc851c20c107 (diff) | |
| download | pleroma-5b2791698c7e09da6a5481f7c024ea8622e9a3c1.tar.gz pleroma-5b2791698c7e09da6a5481f7c024ea8622e9a3c1.zip | |
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
Add mediaproxy whitelist capability
Closes #837
See merge request pleroma/pleroma!1095
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index 7b6631f9b..7e31e6fb7 100644 --- a/docs/config.md +++ b/docs/config.md @@ -205,6 +205,7 @@ This section is used to configure Pleroma-FE, unless ``:managed_config`` in ``:i * `enabled`: Enables proxying of remote media to the instance’s proxy * `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host/CDN fronts. * `proxy_opts`: All options defined in `Pleroma.ReverseProxy` documentation, defaults to `[max_body_length: (25*1_048_576)]`. +* `whitelist`: List of domains to bypass the mediaproxy ## :gopher * `enabled`: Enables the gopher interface |