Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable See merge request pleroma/pleroma!88
This commit is contained in:
commit
1dcc700cca
2 changed files with 3 additions and 1 deletions
|
@ -49,6 +49,7 @@
|
|||
name: "Pleroma",
|
||||
email: "example@example.com",
|
||||
limit: 5000,
|
||||
upload_limit: 16_000_000,
|
||||
registrations_open: true,
|
||||
federating: true
|
||||
|
||||
|
|
|
@ -34,7 +34,8 @@ defmodule Pleroma.Web.Endpoint do
|
|||
Plug.Parsers,
|
||||
parsers: [:urlencoded, :multipart, :json],
|
||||
pass: ["*/*"],
|
||||
json_decoder: Jason
|
||||
json_decoder: Jason,
|
||||
length: Application.get_env(:pleroma, :instance) |> Keyword.get(:upload_limit)
|
||||
)
|
||||
|
||||
plug(Plug.MethodOverride)
|
||||
|
|
Loading…
Reference in a new issue