projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c8b6c7fad0ffe581ccaed93cb770f99e9bc59904..9d8d43c54107399060905e8e9f5ad24a4d7cb7b3 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-97,6
+97,7
@@
config :pleroma, :uri_schemes,
"dat",
"dweb",
"gopher",
"dat",
"dweb",
"gopher",
+ "hyper",
"ipfs",
"ipns",
"irc",
"ipfs",
"ipns",
"irc",
@@
-171,7
+172,7
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.
Hackney
+config :tesla, adapter: Tesla.Adapter.
Gun
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
@@
-188,6
+189,7
@@
config :pleroma, :instance,
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,
+ description_limit: 5_000,
chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
chat_limit: 5_000,
remote_limit: 100_000,
upload_limit: 16_000_000,
@@
-448,8
+450,7
@@
config :pleroma, Pleroma.Web.Metadata,
config :pleroma, Pleroma.Web.Preload,
providers: [
config :pleroma, Pleroma.Web.Preload,
providers: [
- Pleroma.Web.Preload.Providers.Instance,
- Pleroma.Web.Preload.Providers.StatusNet
+ Pleroma.Web.Preload.Providers.Instance
]
config :pleroma, :http_security,
]
config :pleroma, :http_security,
@@
-509,8
+510,7
@@
config :pleroma, Pleroma.User,
config :pleroma, Oban,
repo: Pleroma.Repo,
config :pleroma, Oban,
repo: Pleroma.Repo,
- verbose: false,
- prune: {:maxlen, 1500},
+ log: false,
queues: [
activity_expiration: 10,
federator_incoming: 50,
queues: [
activity_expiration: 10,
federator_incoming: 50,
@@
-524,6
+524,7
@@
config :pleroma, Oban,
attachments_cleanup: 5,
new_users_digest: 1
],
attachments_cleanup: 5,
new_users_digest: 1
],
+ plugins: [Oban.Plugins.Pruner],
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
@@
-659,32
+660,30
@@
config :pleroma, Pleroma.Repo,
prepare: :unnamed
config :pleroma, :connections_pool,
prepare: :unnamed
config :pleroma, :connections_pool,
- checkin_timeout: 250,
+ reclaim_multiplier: 0.1,
+ connection_acquisition_wait: 250,
+ connection_acquisition_retries: 5,
max_connections: 250,
max_connections: 250,
-
retry: 1
,
- retry
_timeout: 100
0,
+
max_idle_time: 30_000
,
+ retry
:
0,
await_up_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
await_up_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
- max_overflow: 10,
- timeout: 150_000
+ max_waiting: 10
],
media: [
size: 50,
],
media: [
size: 50,
- max_overflow: 10,
- timeout: 150_000
+ max_waiting: 10
],
upload: [
size: 25,
],
upload: [
size: 25,
- max_overflow: 5,
- timeout: 300_000
+ max_waiting: 5
],
default: [
size: 10,
],
default: [
size: 10,
- max_overflow: 2,
- timeout: 10_000
+ max_waiting: 2
]
config :pleroma, :hackney_pools,
]
config :pleroma, :hackney_pools,
@@
-717,6
+716,8
@@
config :tzdata, :http_client, Pleroma.HTTP.Tzdata
config :ex_aws, http_client: Pleroma.HTTP.ExAws
config :ex_aws, http_client: Pleroma.HTTP.ExAws
+config :pleroma, :instances_favicons, enabled: false
+
config :pleroma, :exexec,
root_mode: false,
options: %{}
config :pleroma, :exexec,
root_mode: false,
options: %{}