diff options
| author | Alex Gleason <alex@alexgleason.me> | 2022-02-09 11:14:30 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2022-02-09 11:14:30 -0600 |
| commit | c735444f3803a8cff15c1a4aaee82b821ef27441 (patch) | |
| tree | 506fb60d08c6daa1dd73384eb31a919d9fcd2f65 /config | |
| parent | 11f03344d385de78e79e35ccfe8c980f9f6e32b3 (diff) | |
| parent | fa8e2ffa3f493d5b2911507b0ac06094615e9d8f (diff) | |
| download | pleroma-operation-warpsneed.tar.gz | |
Merge remote-tracking branch 'origin/develop' into operation-warpsneedoperation-warpsneed
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)", |