diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-07-20 22:04:47 +0300 |
| commit | 196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3 (patch) | |
| tree | 51fa0436998541c3bcc1885eaa2188d7dbb7d469 /docs/config/howto_mediaproxy.md | |
| parent | c3ecaea64dd377b586e3b2a5316e90884ec78fe6 (diff) | |
| parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
| download | pleroma-196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3.tar.gz | |
Resolve merge conflicts
Diffstat (limited to 'docs/config/howto_mediaproxy.md')
| -rw-r--r-- | docs/config/howto_mediaproxy.md | 4 |
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. |