projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into media-preview-proxy
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 1a2b312b500e5b236620a9e24771e49cf0be79ef..1a4b400f6504a7571b4f9cccb91d440aad106a34 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-424,6
+424,8
@@
config :pleroma, :media_proxy,
proxy_opts: [
redirect_on_failure: false,
max_body_length: 25 * 1_048_576,
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
http: [
follow_redirect: true,
pool: :media
@@
-438,6
+440,13
@@
config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http,
config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil
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
+
config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
@@
-743,8
+752,8
@@
config :pleroma, :pools,
],
media: [
size: 50,
],
media: [
size: 50,
- max_waiting:
1
0,
- recv_timeout: 1
0
_000
+ max_waiting:
2
0,
+ recv_timeout: 1
5
_000
],
upload: [
size: 25,
],
upload: [
size: 25,