projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/flaky-migration-episode-666' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 4b91a58b746de9830726a80d8a8524e8a997852e..eb85a6ed41e5dbcd64a5584270c38c5e289dc904 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-172,7
+172,7
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.
Gun
+config :tesla, adapter: Tesla.Adapter.
Hackney
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
@@
-252,7
+252,8
@@
config :pleroma, :instance,
number: 5,
length: 16
]
number: 5,
length: 16
]
- ]
+ ],
+ show_reactions: true
config :pleroma, :welcome,
direct_message: [
config :pleroma, :welcome,
direct_message: [
@@
-260,6
+261,11
@@
config :pleroma, :welcome,
sender_nickname: nil,
message: nil
],
sender_nickname: nil,
message: nil
],
+ chat_message: [
+ enabled: false,
+ sender_nickname: nil,
+ message: nil
+ ],
email: [
enabled: false,
sender: nil,
email: [
enabled: false,
sender: nil,
@@
-373,6
+379,7
@@
config :pleroma, :mrf_simple,
federated_timeline_removal: [],
report_removal: [],
reject: [],
federated_timeline_removal: [],
report_removal: [],
reject: [],
+ followers_only: [],
accept: [],
avatar_removal: [],
banner_removal: [],
accept: [],
avatar_removal: [],
banner_removal: [],
@@
-391,8
+398,9
@@
config :pleroma, :mrf_vocabulary,
accept: [],
reject: []
accept: [],
reject: []
+# threshold of 7 days
config :pleroma, :mrf_object_age,
config :pleroma, :mrf_object_age,
- threshold:
172
_800,
+ threshold:
604
_800,
actions: [:delist, :strip_followers]
config :pleroma, :rich_media,
actions: [:delist, :strip_followers]
config :pleroma, :rich_media,
@@
-507,8
+515,15
@@
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: []
config :pleroma, Oban,
repo: Pleroma.Repo,
config :pleroma, Oban,
repo: Pleroma.Repo,
@@
-718,7
+733,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.
NoOp
Policy,
+ policies: Pleroma.Web.ActivityPub.MRF.
ObjectAge
Policy,
transparency: true,
transparency_exclusions: []
transparency: true,
transparency_exclusions: []
@@
-728,6
+743,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"