projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index c272ef34a2980f70a048da959b248b2a356b8477..9e4ee8d02e1ecc576f649843195db6223362c0f8 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-238,6
+238,11
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
+config :pleroma, :mrf_keyword,
+ reject: [],
+ federated_timeline_removal: [],
+ replace: []
+
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
@@
-325,14
+330,16
@@
config :pleroma, Pleroma.User,
"web"
]
"web"
]
-config :pleroma, Pleroma.Web.Federator, max_jobs: 50
-
config :pleroma, Pleroma.Web.Federator.RetryQueue,
enabled: false,
max_jobs: 20,
initial_timeout: 30,
max_retries: 5
config :pleroma, Pleroma.Web.Federator.RetryQueue,
enabled: false,
max_jobs: 20,
initial_timeout: 30,
max_retries: 5
+config :pleroma, Pleroma.Jobs,
+ federator_incoming: [max_jobs: 50],
+ federator_outgoing: [max_jobs: 50]
+
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs"
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
import_config "#{Mix.env()}.exs"