diff options
| author | kaniini <nenolod@gmail.com> | 2018-12-29 11:46:06 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-12-29 11:46:06 +0000 |
| commit | 3dc5f04976293fbcedfc01281f89c4f54c995d59 (patch) | |
| tree | a5f7fc71bdd0e9a77874d56b8034c7c181883d97 /config/config.exs | |
| parent | dd8f2196f62ab4d4cdec67bdb2b434a317a3f396 (diff) | |
| parent | 9c782e59ddac5fa01cd5b2517f282b283f01bc1d (diff) | |
| download | pleroma-3dc5f04976293fbcedfc01281f89c4f54c995d59.tar.gz pleroma-3dc5f04976293fbcedfc01281f89c4f54c995d59.zip | |
Merge branch 'carrot-bullying' into 'develop'
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 1983b31ab..90e3a4aec 100644 --- a/config/config.exs +++ b/config/config.exs @@ -98,7 +98,8 @@ config :pleroma, :instance, name: "Pleroma", email: "example@example.com", description: "A Pleroma instance, an alternative fediverse server", - limit: 5000, + limit: 5_000, + remote_limit: 100_000, upload_limit: 16_000_000, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, |