summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-18 12:29:26 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-18 12:29:26 +0000
commite2c39e1cc077c77f3bd8325b99e9a21d42b8133e (patch)
tree25479e5ae801c0fce2e9137ab378f88d6dacddeb
parent0e502cb836369b9581c2196d3ce7a3c8e028ea8c (diff)
parent129078eddc1422e3654514477fe438b56dcff562 (diff)
downloadpleroma-e2c39e1cc077c77f3bd8325b99e9a21d42b8133e.tar.gz
pleroma-e2c39e1cc077c77f3bd8325b99e9a21d42b8133e.zip
Merge branch 'fix-howto_mediaproxy' into 'develop'
Fix media proxy doc redirect setting not working See merge request pleroma/pleroma!1448
-rw-r--r--docs/config/howto_mediaproxy.md4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/config/howto_mediaproxy.md b/docs/config/howto_mediaproxy.md
index fb731112b..ed70c3ed4 100644
--- a/docs/config/howto_mediaproxy.md
+++ b/docs/config/howto_mediaproxy.md
@@ -24,7 +24,9 @@ If you came here from one of the installation guides, take a look at the example
```
config :pleroma, :media_proxy,
enabled: true,
- redirect_on_failure: true
+ proxy_opts: [
+ redirect_on_failure: true
+ ]
#base_url: "https://cache.pleroma.social"
```
If you want to use a subdomain to serve the files, uncomment `base_url`, change the url and add a comma after `true` in the previous line.