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 feature/gen-magic
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index ed37b93c0712429ea35f2cebf7472ca766a80391..46a649b73a6e8a756df08eec8b608177f857ddee 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-454,9
+454,7
@@
config :pleroma, :gopher,
config :pleroma, Pleroma.Web.Metadata,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
config :pleroma, Pleroma.Web.Metadata,
providers: [
Pleroma.Web.Metadata.Providers.OpenGraph,
- Pleroma.Web.Metadata.Providers.TwitterCard,
- Pleroma.Web.Metadata.Providers.RelMe,
- Pleroma.Web.Metadata.Providers.Feed
+ Pleroma.Web.Metadata.Providers.TwitterCard
],
unfurl_nsfw: false
],
unfurl_nsfw: false
@@
-532,6
+530,7
@@
config :pleroma, Oban,
log: false,
queues: [
activity_expiration: 10,
log: false,
queues: [
activity_expiration: 10,
+ token_expiration: 5,
federator_incoming: 50,
federator_outgoing: 50,
web_push: 50,
federator_incoming: 50,
federator_outgoing: 50,
web_push: 50,
@@
-545,9
+544,6
@@
config :pleroma, Oban,
],
plugins: [Oban.Plugins.Pruner],
crontab: [
],
plugins: [Oban.Plugins.Pruner],
crontab: [
- {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
- {"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
- {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker},
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
{"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
]
{"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker},
{"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker}
]
@@
-658,7
+654,7
@@
config :pleroma, :rate_limit,
account_confirmation_resend: {8_640_000, 5},
ap_routes: {60_000, 15}
account_confirmation_resend: {8_640_000, 5},
ap_routes: {60_000, 15}
-config :pleroma, Pleroma.
ActivityExpiration, enabled: true
+config :pleroma, Pleroma.
Workers.PurgeExpiredActivity, enabled: true, min_lifetime: 600
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: true
@@
-672,7
+668,7
@@
config :pleroma, :static_fe, enabled: false
# With no frontend configuration, the bundled files from the `static` directory will
# be used.
#
# With no frontend configuration, the bundled files from the `static` directory will
# be used.
#
-# config :pleroma, :frontends,
+# config :pleroma, :frontends,
# primary: %{"name" => "pleroma-fe", "ref" => "develop"},
# admin: %{"name" => "admin-fe", "ref" => "stable"},
# available: %{...}
# primary: %{"name" => "pleroma-fe", "ref" => "develop"},
# admin: %{"name" => "admin-fe", "ref" => "stable"},
# available: %{...}
@@
-736,28
+732,28
@@
config :pleroma, :connections_pool,
max_connections: 250,
max_idle_time: 30_000,
retry: 0,
max_connections: 250,
max_idle_time: 30_000,
retry: 0,
-
await_up
_timeout: 5_000
+
connect
_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
max_waiting: 10,
config :pleroma, :pools,
federation: [
size: 50,
max_waiting: 10,
- timeout: 10_000
+
recv_
timeout: 10_000
],
media: [
size: 50,
max_waiting: 10,
],
media: [
size: 50,
max_waiting: 10,
- timeout: 10_000
+
recv_
timeout: 10_000
],
upload: [
size: 25,
max_waiting: 5,
],
upload: [
size: 25,
max_waiting: 5,
- timeout: 15_000
+
recv_
timeout: 15_000
],
default: [
size: 10,
max_waiting: 2,
],
default: [
size: 10,
max_waiting: 2,
- timeout: 5_000
+
recv_
timeout: 5_000
]
config :pleroma, :hackney_pools,
]
config :pleroma, :hackney_pools,
@@
-774,6
+770,8
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
+config :pleroma, :majic_pool, size: 2
+
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,