projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid `use Phoenix.Swoosh` to prevent recompiling the Endpoint
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index dc5964fc904a0739cc184bd14dd349a5ffc6b4eb..66aee3264a0fa0a305a6748ceba77d1b846d1369 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-438,7
+438,9
@@
config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Http,
headers: [],
options: []
headers: [],
options: []
-config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script, script_path: nil
+config :pleroma, Pleroma.Web.MediaProxy.Invalidation.Script,
+ script_path: nil,
+ url_format: nil
# Note: media preview proxy depends on media proxy to be enabled
config :pleroma, :media_preview_proxy,
# Note: media preview proxy depends on media proxy to be enabled
config :pleroma, :media_preview_proxy,
@@
-541,6
+543,7
@@
config :pleroma, Oban,
queues: [
activity_expiration: 10,
token_expiration: 5,
queues: [
activity_expiration: 10,
token_expiration: 5,
+ filter_expiration: 1,
backup: 1,
federator_incoming: 50,
federator_outgoing: 50,
backup: 1,
federator_incoming: 50,
federator_outgoing: 50,
@@
-551,7
+554,7
@@
config :pleroma, Oban,
scheduled_activities: 10,
background: 5,
remote_fetcher: 2,
scheduled_activities: 10,
background: 5,
remote_fetcher: 2,
- attachments_cleanup:
5
,
+ attachments_cleanup:
1
,
new_users_digest: 1,
mute_expire: 5
],
new_users_digest: 1,
mute_expire: 5
],
@@
-608,10
+611,7
@@
config :ueberauth,
base_path: "/oauth",
providers: ueberauth_providers
base_path: "/oauth",
providers: ueberauth_providers
-config :pleroma,
- :auth,
- enforce_oauth_admin_scope_usage: true,
- oauth_consumer_strategies: oauth_consumer_strategies
+config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
config :pleroma, Pleroma.Emails.Mailer, adapter: Swoosh.Adapters.Sendmail, enabled: false
@@
-723,7
+723,10
@@
config :pleroma, :frontends,
"git" => "https://git.pleroma.social/pleroma/fedi-fe",
"build_url" =>
"https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
"git" => "https://git.pleroma.social/pleroma/fedi-fe",
"build_url" =>
"https://git.pleroma.social/pleroma/fedi-fe/-/jobs/artifacts/${ref}/download?job=build",
- "ref" => "master"
+ "ref" => "master",
+ "custom-http-headers" => [
+ {"service-worker-allowed", "/"}
+ ]
},
"admin-fe" => %{
"name" => "admin-fe",
},
"admin-fe" => %{
"name" => "admin-fe",
@@
-832,6
+835,11
@@
config :pleroma, Pleroma.User.Backup,
limit_days: 7,
dir: nil
limit_days: 7,
dir: nil
+config :pleroma, ConcurrentLimiter, [
+ {Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
+ {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
+]
+
# 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"