aboutsummaryrefslogtreecommitdiff
path: root/docs/config.md
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-14 21:47:02 +0000
committerkaniini <nenolod@gmail.com>2019-03-14 21:47:02 +0000
commit7ecc201029a8c90cf5dc3313ff78d56eb0a2445c (patch)
tree44c63ed6430a743cfe589fed5213467a0dd6dabb /docs/config.md
parent34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff)
parentcbdd11c38111fd7c195983f40265b675e1201d4e (diff)
downloadpleroma-7ecc201029a8c90cf5dc3313ff78d56eb0a2445c.tar.gz
Merge branch 'fix/filename-mangling' into 'develop'
Stop mangling filenames and enable dedupe by default Closes #715 See merge request pleroma/pleroma!927
Diffstat (limited to 'docs/config.md')
-rw-r--r--docs/config.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md
index a09ea95f3..e34ffe980 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -6,6 +6,7 @@ If you run Pleroma with ``MIX_ENV=prod`` the file is ``prod.secret.exs``, otherw
## Pleroma.Upload
* `uploader`: Select which `Pleroma.Uploaders` to use
* `filters`: List of `Pleroma.Upload.Filter` to use.
+* `link_name`: When enabled Pleroma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe`
* `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host.
* `proxy_remote`: If you\'re using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
* `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.