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 c52ee8f82407f23b8ba1eaecde5f185b74dd7f6b..5739095f0f85e16a60fe745ee9a9e2abd2822bfb 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-233,6
+233,9
@@
config :pleroma, :instance,
"text/markdown",
"text/bbcode"
],
"text/markdown",
"text/bbcode"
],
+ mrf_transparency: true,
+ mrf_transparency_exclusions: [],
+ staff_transparency: [],
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
autofollowed_nicknames: [],
autofollowing_nicknames: [],
max_pinned_statuses: 1,
@@
-551,6
+554,7
@@
config :pleroma, Oban,
queues: [
activity_expiration: 10,
token_expiration: 5,
queues: [
activity_expiration: 10,
token_expiration: 5,
+ backup: 1,
federator_incoming: 50,
federator_outgoing: 50,
ingestion_queue: 50,
federator_incoming: 50,
federator_outgoing: 50,
ingestion_queue: 50,
@@
-835,6
+839,11
@@
config :floki, :html_parser, Floki.HTMLParser.FastHtml
config :pleroma, Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.PleromaAuthenticator
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"