diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-03 12:40:42 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-03 14:42:11 -0500 |
| commit | 6141eb94ab034b5141a5c60b2814fb45b829c1ac (patch) | |
| tree | 98df2ed6006d29b84e92d11663f7ec3d09a0b78c /config | |
| parent | 85446cc30c97a326d90b4ef719ba2e54c2ad423f (diff) | |
| download | pleroma-6141eb94ab034b5141a5c60b2814fb45b829c1ac.tar.gz | |
Fetch preview requests through the MediaProxy. Separate connection options are not needed.
Use a separate pool for preview requests
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/description.exs | 21 |
2 files changed, 6 insertions, 25 deletions
diff --git a/config/config.exs b/config/config.exs index 317ef84a9..d691753bd 100644 --- a/config/config.exs +++ b/config/config.exs @@ -445,10 +445,7 @@ config :pleroma, :media_preview_proxy, enabled: false, thumbnail_max_width: 600, thumbnail_max_height: 600, - image_quality: 85, - proxy_opts: [ - head_request_max_read_duration: 5_000 - ] + image_quality: 85 config :pleroma, :chat, enabled: true @@ -761,6 +758,11 @@ config :pleroma, :pools, max_waiting: 10, timeout: 10_000 ], + preview: [ + size: 50, + max_waiting: 10, + timeout: 10_000 + ], upload: [ size: 25, max_waiting: 5, diff --git a/config/description.exs b/config/description.exs index 868b89d29..73333d6e6 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1978,27 +1978,6 @@ config :pleroma, :config_description, [ key: :image_quality, type: :integer, description: "Quality of the output. Ranges from 0 (min quality) to 100 (max quality)." - }, - %{ - key: :proxy_opts, - type: :keyword, - description: "Media proxy options", - suggestions: [ - head_request_max_read_duration: 5_000 - ], - children: [ - %{ - key: :head_request_max_read_duration, - type: :integer, - description: "Timeout (in milliseconds) of HEAD request to remote URI." - } - ] - }, - %{ - key: :whitelist, - type: {:list, :string}, - description: "List of hosts with scheme to bypass the mediaproxy", - suggestions: ["http://example.com"] } ] }, |