projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'develop'
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 660ba17755413cb21ff5c3dcf5a572cd80b95308..826dd07b7e42a201db8617c30ed61dce2bd928d1 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-53,7
+53,16
@@
config :pleroma, :instance,
upload_limit: 16_000_000,
registrations_open: true,
federating: true,
upload_limit: 16_000_000,
registrations_open: true,
federating: true,
- rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy
+ rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
+ public: true
+
+config :pleroma, :activitypub, accept_blocks: true
+
+config :pleroma, :mrf_simple,
+ media_removal: [],
+ media_nsfw: [],
+ federated_timeline_removal: [],
+ reject: []
config :pleroma, :media_proxy,
enabled: false,
config :pleroma, :media_proxy,
enabled: false,