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 'upstream/develop' into aliases
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 317aa0f04eff32e3e61f9c1ad5a6d1c650764b20..2c614236033863a8560fbeae068f54eb0c24fe51 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-72,7
+72,8
@@
config :pleroma, Pleroma.Upload,
pool: :upload
]
],
pool: :upload
]
],
- filename_display_max_length: 30
+ filename_display_max_length: 30,
+ default_description: nil
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
@@
-129,6
+130,7
@@
config :pleroma, Pleroma.Web.Endpoint,
dispatch: [
{:_,
[
dispatch: [
{:_,
[
+ {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []},
{"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
{"/websocket", Phoenix.Endpoint.CowboyWebSocket,
{Phoenix.Transports.WebSocket,
{"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []},
{"/websocket", Phoenix.Endpoint.CowboyWebSocket,
{Phoenix.Transports.WebSocket,
@@
-147,6
+149,16
@@
config :pleroma, Pleroma.Web.Endpoint,
"SameSite=Lax"
]
"SameSite=Lax"
]
+config :pleroma, :fed_sockets,
+ enabled: false,
+ connection_duration: :timer.hours(8),
+ rejection_duration: :timer.minutes(15),
+ fed_socket_fetches: [
+ default: 12_000,
+ interval: 3_000,
+ lazy: false
+ ]
+
# Configures Elixir's Logger
config :logger, :console,
level: :debug,
# Configures Elixir's Logger
config :logger, :console,
level: :debug,
@@
-215,7
+227,6
@@
config :pleroma, :instance,
allow_relay: true,
public: true,
quarantined_instances: [],
allow_relay: true,
public: true,
quarantined_instances: [],
- managed_config: true,
static_dir: "instance/static/",
allowed_post_formats: [
"text/plain",
static_dir: "instance/static/",
allowed_post_formats: [
"text/plain",
@@
-411,6
+422,7
@@
config :pleroma, :rich_media,
Pleroma.Web.RichMedia.Parsers.TwitterCard,
Pleroma.Web.RichMedia.Parsers.OEmbed
],
Pleroma.Web.RichMedia.Parsers.TwitterCard,
Pleroma.Web.RichMedia.Parsers.OEmbed
],
+ failure_backoff: 60_000,
ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
config :pleroma, :media_proxy,
ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl]
config :pleroma, :media_proxy,
@@
-422,6
+434,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
@@
-436,6
+450,14
@@
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,
+ min_content_length: 100 * 1024
+
config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
config :pleroma, :chat, enabled: true
config :phoenix, :format_encoders, json: Jason
@@
-452,9
+474,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
@@
-515,7
+535,13
@@
config :pleroma, Pleroma.User,
"user-search",
"user_exists",
"users",
"user-search",
"user_exists",
"users",
- "web"
+ "web",
+ "verify_credentials",
+ "update_credentials",
+ "relationships",
+ "search",
+ "confirmation_resend",
+ "mfa"
],
email_blacklist: []
],
email_blacklist: []
@@
-524,8
+550,10
@@
config :pleroma, Oban,
log: false,
queues: [
activity_expiration: 10,
log: false,
queues: [
activity_expiration: 10,
+ token_expiration: 5,
federator_incoming: 50,
federator_outgoing: 50,
federator_incoming: 50,
federator_outgoing: 50,
+ ingestion_queue: 50,
web_push: 50,
mailer: 10,
transmogrifier: 20,
web_push: 50,
mailer: 10,
transmogrifier: 20,
@@
-537,9
+565,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}
]
@@
-650,9
+675,20
@@
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.Web.Plugs.RemoteIp,
+ enabled: true,
+ headers: ["x-forwarded-for"],
+ proxies: [],
+ reserved: [
+ "127.0.0.0/8",
+ "::1/128",
+ "fc00::/7",
+ "10.0.0.0/8",
+ "172.16.0.0/12",
+ "192.168.0.0/16"
+ ]
config :pleroma, :static_fe, enabled: false
config :pleroma, :static_fe, enabled: false
@@
-664,7
+700,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: %{...}
@@
-728,24
+764,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,
config :pleroma, :pools,
federation: [
size: 50,
- max_waiting: 10
+ max_waiting: 10,
+ recv_timeout: 10_000
],
media: [
size: 50,
],
media: [
size: 50,
- max_waiting: 10
+ max_waiting: 20,
+ recv_timeout: 15_000
],
upload: [
size: 25,
],
upload: [
size: 25,
- max_waiting: 5
+ max_waiting: 5,
+ recv_timeout: 15_000
],
default: [
size: 10,
],
default: [
size: 10,
- max_waiting: 2
+ max_waiting: 2,
+ recv_timeout: 5_000
]
config :pleroma, :hackney_pools,
]
config :pleroma, :hackney_pools,
@@
-762,10
+802,14
@@
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,
config :pleroma, :restrict_unauthenticated,
- timelines: %{local:
false, federated: false
},
- profiles: %{local:
false, remote: false
},
- activities: %{local:
false, remote: false
}
+ timelines: %{local:
private_instance?, federated: private_instance?
},
+ profiles: %{local:
private_instance?, remote: private_instance?
},
+ activities: %{local:
private_instance?, remote: private_instance?
}
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
@@
-778,8
+822,14
@@
config :tzdata, :http_client, Pleroma.HTTP.Tzdata
config :ex_aws, http_client: Pleroma.HTTP.ExAws
config :ex_aws, http_client: Pleroma.HTTP.ExAws
+config :web_push_encryption, http_client: Pleroma.HTTP.WebPush
+
config :pleroma, :instances_favicons, enabled: false
config :pleroma, :instances_favicons, enabled: false
+config :floki, :html_parser, Floki.HTMLParser.FastHtml
+
+config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
+
# 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"