projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better error handling for OstatusController.
[akkoma]
/
lib
/
pleroma
/
web
/
endpoint.ex
diff --git
a/lib/pleroma/web/endpoint.ex
b/lib/pleroma/web/endpoint.ex
index 0a2ac853e768948143b5bc702434ff3c9410b3a5..1a012c1b416a05c5e6743cf2f0792af0045042e4 100644
(file)
--- a/
lib/pleroma/web/endpoint.ex
+++ b/
lib/pleroma/web/endpoint.ex
@@
-11,13
+11,13
@@
defmodule Pleroma.Web.Endpoint do
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
#
# You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production.
- plug(Plug.Static, at: "/media", from:
"uploads"
, gzip: false)
+ plug(Plug.Static, at: "/media", from:
Pleroma.Upload.upload_path()
, gzip: false)
plug(
Plug.Static,
at: "/",
from: :pleroma,
plug(
Plug.Static,
at: "/",
from: :pleroma,
- only: ~w(index.html static finmoji emoji packs sounds images instance sw.js)
+ only: ~w(index.html static finmoji emoji packs sounds images instance sw.js
favicon.png
)
)
# Code reloading can be explicitly enabled under the
)
# Code reloading can be explicitly enabled under the
@@
-34,7
+34,8
@@
defmodule Pleroma.Web.Endpoint do
Plug.Parsers,
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
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)
)
plug(Plug.MethodOverride)