diff options
| author | Alex Gleason <alex@alexgleason.me> | 2022-02-06 18:25:14 +0000 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2022-02-06 18:25:14 +0000 |
| commit | fa8e2ffa3f493d5b2911507b0ac06094615e9d8f (patch) | |
| tree | 34686c246e9517ae9018175ffee93804935d59c0 /config | |
| parent | 60deddb7e5b8bb10037cca6e6f11a5bbef298d39 (diff) | |
| parent | e473bcf7a0390584377d89ff68267a25fe31e44d (diff) | |
| download | pleroma-fa8e2ffa3f493d5b2911507b0ac06094615e9d8f.tar.gz pleroma-fa8e2ffa3f493d5b2911507b0ac06094615e9d8f.zip | |
Merge branch 'max_media_attachments' into 'develop'
Allow specifying max media attachment count
Closes #2665
See merge request pleroma/pleroma!3630
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | config/description.exs | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 5e82f203c..6a5acda09 100644 --- a/config/config.exs +++ b/config/config.exs @@ -259,7 +259,8 @@ config :pleroma, :instance, privileged_staff: false, max_endorsed_users: 20, birthday_required: false, - birthday_min_age: 0 + birthday_min_age: 0, + max_media_attachments: 1_000 config :pleroma, :welcome, direct_message: [ diff --git a/config/description.exs b/config/description.exs index 3f66877e4..704af8f68 100644 --- a/config/description.exs +++ b/config/description.exs @@ -553,6 +553,14 @@ config :pleroma, :config_description, [ ] }, %{ + key: :max_media_attachments, + type: :integer, + description: "Maximum number of post media attachments", + suggestions: [ + 1_000_000 + ] + }, + %{ key: :upload_limit, type: :integer, description: "File size limit of uploads (except for avatar, background, banner)", |