projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 98c94c14922c72c262b9de091eb7bb3e6740d9fe..271224e85f2aa70aabb30b31c865b402b00acc21 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, %{
@@
-146,6
+146,7
@@
config :pleroma, :instance,
banner_upload_limit: 4_000_000,
registrations_open: true,
federating: true,
banner_upload_limit: 4_000_000,
registrations_open: true,
federating: true,
+ federation_reachability_timeout_days: 7,
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true,
allow_relay: true,
rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
public: true,
@@
-161,7
+162,9
@@
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
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
@@
-226,7
+229,9
@@
config :pleroma, :mrf_rejectnonpublic,
allow_followersonly: false,
allow_direct: false
allow_followersonly: false,
allow_direct: false
-config :pleroma, :mrf_hellthread, threshold: 10
+config :pleroma, :mrf_hellthread,
+ delist_threshold: 10,
+ reject_threshold: 20
config :pleroma, :mrf_simple,
media_removal: [],
config :pleroma, :mrf_simple,
media_removal: [],
@@
-235,6
+240,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,