alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into 'develop' 

Fix failure to serve media from custom upload path

See merge request pleroma/pleroma!95
This commit is contained in:
lambda 2018-04-05 10:54:07 +00:00
parent d70d1c427a 033771d9f1
commit 45627dde17
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/upload.ex
View File

@ -58,7 +58,7 @@ def store(%{"img" => "data:image/" <> image_data}) do
} }
end end
defp upload_path do def upload_path do
settings = Application.get_env(:pleroma, Pleroma.Upload) settings = Application.get_env(:pleroma, Pleroma.Upload)
Keyword.fetch!(settings, :uploads) Keyword.fetch!(settings, :uploads)
end end

2
lib/pleroma/web/endpoint.ex
View File

@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do
# #
# You should set gzip to true if you are running phoenix.digest # You should set gzip to true if you are running phoenix.digest
# when deploying your static files in production. # 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(
Plug.Static, Plug.Static,