Unverified Commit 033771d9 authored by Steph's avatar Steph
Browse files

Fix failure to serve media from custom upload path

parent d70d1c42
...@@ -58,7 +58,7 @@ def store(%{"img" => "data:image/" <> image_data}) do ...@@ -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
......
...@@ -11,7 +11,7 @@ defmodule Pleroma.Web.Endpoint do ...@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment