Fix failure to serve media from custom upload path

diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 8a9dc612a4c654f4803617ac4f44b216bd55f82c..e5df9400987adfc285302975d32cdc78e1829339 100644 (file)
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -58,7 +58,7 @@ defmodule Pleroma.Upload do
     }
   end
 
-  defp upload_path do
+  def upload_path do
     settings = Application.get_env(:pleroma, Pleroma.Upload)
     Keyword.fetch!(settings, :uploads)
   end

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index dde4e3ffec097f1abbc9348fdb7e74c302579f67..dfafc95f44c22cc4630b9847aefc3c8ea7fcdf5f 100644 (file)
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -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,