diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-01 08:36:48 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-01 08:36:48 +0000 |
| commit | 1dcc700cca378f813b8f232e26c0f6f494a8336e (patch) | |
| tree | a685333f9814db3447d4920574b3a8ea35c0463c | |
| parent | 5fa8237bc1dcabca050dc5d8d9325fec649e1723 (diff) | |
| parent | 4bf86d4cf5b3641fb37013165442cb0f5e3ab591 (diff) | |
| download | pleroma-1dcc700cca378f813b8f232e26c0f6f494a8336e.tar.gz | |
Merge branch 'feature/upload-limit' into 'develop'
config: make the upload limit configurable
See merge request pleroma/pleroma!88
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 151c6b826..cf8d6c2b7 100644 --- a/config/config.exs +++ b/config/config.exs @@ -49,6 +49,7 @@ config :pleroma, :instance, name: "Pleroma", email: "example@example.com", limit: 5000, + upload_limit: 16_000_000, registrations_open: true, federating: true diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 0a2ac853e..dde4e3ffe 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -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) |