projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'revert-0a82a7e6' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 4dc7a62d72824b84fb813c46b73295d1274a73fc..d0d53a64a2fa25127c8d9f1a226ee727b87db190 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-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,
@@
-235,6
+236,8
@@
config :pleroma, :mrf_simple,
reject: [],
accept: []
reject: [],
accept: []
+config :pleroma, :rich_media, enabled: true
+
config :pleroma, :media_proxy,
enabled: false,
proxy_opts: [
config :pleroma, :media_proxy,
enabled: false,
proxy_opts: [