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 'remotes/origin/develop' into auth-improvements
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index ea8869d481b2f998b4256fa8a39b054259c63a68..f7455cf97917fbb8072e0a9774de4ed60bebcee7 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-123,7
+123,6
@@
websocket_config = [
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
- instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
url: [host: "localhost"],
http: [
ip: {127, 0, 0, 1},
url: [host: "localhost"],
http: [
ip: {127, 0, 0, 1},
@@
-142,7
+141,7
@@
config :pleroma, Pleroma.Web.Endpoint,
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
signing_salt: "CqaoopA2",
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
signing_salt: "CqaoopA2",
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
- pubsub
: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
,
+ pubsub
_server: Pleroma.PubSub
,
secure_cookie_flag: true,
extra_cookie_attrs: [
"SameSite=Lax"
secure_cookie_flag: true,
extra_cookie_attrs: [
"SameSite=Lax"
@@
-216,7
+215,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",
@@
-225,6
+223,7
@@
config :pleroma, :instance,
"text/bbcode"
],
autofollowed_nicknames: [],
"text/bbcode"
],
autofollowed_nicknames: [],
+ autofollowing_nicknames: [],
max_pinned_statuses: 1,
attachment_links: false,
max_report_comment_size: 1000,
max_pinned_statuses: 1,
attachment_links: false,
max_report_comment_size: 1000,
@@
-254,7
+253,8
@@
config :pleroma, :instance,
length: 16
]
],
length: 16
]
],
- show_reactions: true
+ show_reactions: true,
+ password_reset_token_validity: 60 * 60 * 24
config :pleroma, :welcome,
direct_message: [
config :pleroma, :welcome,
direct_message: [
@@
-412,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,
@@
-423,6
+424,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
@@
-437,6
+440,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
@@
-453,9
+464,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
@@
-531,8
+540,11
@@
config :pleroma, Oban,
log: false,
queues: [
activity_expiration: 10,
log: false,
queues: [
activity_expiration: 10,
+ token_expiration: 5,
+ backup: 1,
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,
@@
-540,13
+552,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}
]
@@
-618,7
+628,12
@@
config :pleroma, Pleroma.Emails.UserEmail,
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
config :pleroma, Pleroma.Emails.NewUsersDigestEmail, enabled: false
-config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics"
+config :prometheus, Pleroma.Web.Endpoint.MetricsExporter,
+ enabled: false,
+ auth: false,
+ ip_whitelist: [],
+ path: "/api/pleroma/app_metrics",
+ format: :text
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 25,
config :pleroma, Pleroma.ScheduledActivity,
daily_user_limit: 25,
@@
-657,9
+672,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
@@
-671,7
+697,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: %{...}
@@
-735,28
+761,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,
],
media: [
size: 50,
- max_waiting:
1
0,
-
timeout: 10
_000
+ max_waiting:
2
0,
+
recv_timeout: 15
_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,
@@
-773,6
+799,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,
@@
-783,7
+811,7
@@
config :pleroma, :restrict_unauthenticated,
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, :mrf,
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: false
config :pleroma, :mrf,
- policies:
Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy
,
+ policies:
[Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy, Pleroma.Web.ActivityPub.MRF.TagPolicy]
,
transparency: true,
transparency_exclusions: []
transparency: true,
transparency_exclusions: []
@@
-791,12
+819,19
@@
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 :floki, :html_parser, Floki.HTMLParser.FastHtml
config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
config :pleroma, :instances_favicons, enabled: false
config :floki, :html_parser, Floki.HTMLParser.FastHtml
config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
+config :pleroma, Pleroma.User.Backup,
+ purge_after_days: 30,
+ limit_days: 7,
+ dir: nil
+
# 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"