diff options
| author | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-09-18 18:38:20 +0000 |
| commit | 6c052bd5b6cc29d321b500654bd6b098d0e6c56a (patch) | |
| tree | 9357c0e0f653f8e35d63e32eb0faf090e600a816 /config/config.exs | |
| parent | 91ddd47e513c5fc343ffa9bea069801b0142a115 (diff) | |
| parent | a42880040574701000470fc1c2dbd6f7242c1a06 (diff) | |
| download | pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.tar.gz pleroma-6c052bd5b6cc29d321b500654bd6b098d0e6c56a.zip | |
Merge branch 'media-preview-proxy-nostream' into 'develop'
Media preview proxy
See merge request pleroma/pleroma!3001
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 147f09722..00624bf00 100644 --- a/config/config.exs +++ b/config/config.exs @@ -434,6 +434,8 @@ config :pleroma, :media_proxy, proxy_opts: [ redirect_on_failure: false, max_body_length: 25 * 1_048_576, + # Note: max_read_duration defaults to Pleroma.ReverseProxy.max_read_duration_default/1 + max_read_duration: 30_000, http: [ follow_redirect: true, pool: :media @@ -448,6 +450,14 @@ config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http, config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil +# Note: media preview proxy depends on media proxy to be enabled +config :pleroma, :media_preview_proxy, + enabled: false, + thumbnail_max_width: 600, + thumbnail_max_height: 600, + image_quality: 85, + min_content_length: 100 * 1024 + config :pleroma, :chat, enabled: true config :phoenix, :format_encoders, json: Jason @@ -753,8 +763,8 @@ config :pleroma, :pools, ], media: [ size: 50, - max_waiting: 10, - recv_timeout: 10_000 + max_waiting: 20, + recv_timeout: 15_000 ], upload: [ size: 25, |