projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 317aa0f04eff32e3e61f9c1ad5a6d1c650764b20..c975da739b9a05b1cc15c7a56403c312d65eb767 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"
@@
-411,6
+412,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,
@@
-452,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
@@
-515,7
+515,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,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,
@@
-533,13
+540,11
@@
config :pleroma, Oban,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 5,
background: 5,
remote_fetcher: 2,
attachments_cleanup: 5,
- new_users_digest: 1
+ new_users_digest: 1,
+ mute_expire: 5
],
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,7
+655,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
@@
-664,7
+669,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
+733,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: 10,
+ recv_timeout: 10_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
+771,12
@@
config :pleroma, :hackney_pools,
timeout: 300_000
]
timeout: 300_000
]
+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
@@
-780,6
+791,10
@@
config :ex_aws, http_client: Pleroma.HTTP.ExAws
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"