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
commit 45627dde17
2 changed files with 2 additions and 2 deletions

View file

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

View file

@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do
#
# 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,