projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mix: add timex dependency
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 0db940fdc84afe5d18d59121d14c7eba01672beb..6119aaea111b3a33d322ffa6312ed4a09394d569 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-115,7
+115,7
@@
config :logger, :console,
config :logger, :ex_syslogger,
level: :debug,
ident: "Pleroma",
config :logger, :ex_syslogger,
level: :debug,
ident: "Pleroma",
- format: "$
date $time $
metadata[$level] $message",
+ format: "$metadata[$level] $message",
metadata: [:request_id]
config :mime, :types, %{
metadata: [:request_id]
config :mime, :types, %{
@@
-162,7
+162,10
@@
config :pleroma, :instance,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
- no_attachment_links: false
+ no_attachment_links: false,
+ welcome_user_nickname: nil,
+ welcome_message: nil,
+ max_report_comment_size: 1000
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@
-228,8
+231,8
@@
config :pleroma, :mrf_rejectnonpublic,
allow_direct: false
config :pleroma, :mrf_hellthread,
allow_direct: false
config :pleroma, :mrf_hellthread,
- delist_threshold:
5
,
- reject_threshold:
1
0
+ delist_threshold:
10
,
+ reject_threshold:
2
0
config :pleroma, :mrf_simple,
media_removal: [],
config :pleroma, :mrf_simple,
media_removal: [],
@@
-238,6
+241,11
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
+config :pleroma, :mrf_keyword,
+ reject: [],
+ federated_timeline_removal: [],
+ replace: []
+
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy,
@@
-333,7
+341,8
@@
config :pleroma, Pleroma.Web.Federator.RetryQueue,
config :pleroma, Pleroma.Jobs,
federator_incoming: [max_jobs: 50],
config :pleroma, Pleroma.Jobs,
federator_incoming: [max_jobs: 50],
- federator_outgoing: [max_jobs: 50]
+ federator_outgoing: [max_jobs: 50],
+ mailer: [max_jobs: 10]
# 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.