projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 99b500993c7284c72723a5e284f1e12374bbc060..7d539f994fdd43e596135b8064e539439ae9c960 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-194,6
+194,8
@@
config :pleroma, :http,
send_user_agent: true,
adapter: [
ssl_options: [
send_user_agent: true,
adapter: [
ssl_options: [
+ # Workaround for remote server certificate chain issues
+ partial_chain: &:hackney_connect.partial_chain/1,
# We don't support TLS v1.3 yet
versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
]
# We don't support TLS v1.3 yet
versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
]
@@
-238,6
+240,7
@@
config :pleroma, :instance,
"text/bbcode"
],
mrf_transparency: true,
"text/bbcode"
],
mrf_transparency: true,
+ mrf_transparency_exclusions: [],
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: false,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
no_attachment_links: false,
@@
-336,7
+339,12
@@
config :pleroma, :mrf_subchain, match_actor: %{}
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
config :pleroma, :rich_media,
enabled: true,
ignore_hosts: [],
- ignore_tld: ["local", "localdomain", "lan"]
+ ignore_tld: ["local", "localdomain", "lan"],
+ parsers: [
+ Pleroma.Web.RichMedia.Parsers.TwitterCard,
+ Pleroma.Web.RichMedia.Parsers.OGP,
+ Pleroma.Web.RichMedia.Parsers.OEmbed
+ ]
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,
@@
-519,7
+527,9
@@
config :http_signatures,
config :pleroma, :rate_limit,
search: [{1000, 10}, {1000, 30}],
config :pleroma, :rate_limit,
search: [{1000, 10}, {1000, 30}],
- app_account_creation: {1_800_000, 25}
+ app_account_creation: {1_800_000, 25},
+ statuses_actions: {10_000, 15},
+ status_id_action: {60_000, 3}
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.