diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-04-05 10:54:07 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-04-05 10:54:07 +0000 |
| commit | 45627dde17a4093775e770e83bffbfec4e1b6759 (patch) | |
| tree | 086ae0eb1732ec22cc1e7cd9dbd6bd015c59b833 /lib | |
| parent | d70d1c427a29411f2b47789f91894cd08f91ba6e (diff) | |
| parent | 033771d9f186012a066d8b42152a18076651171f (diff) | |
| download | pleroma-45627dde17a4093775e770e83bffbfec4e1b6759.tar.gz | |
Merge branch 'develop' into 'develop'
Fix failure to serve media from custom upload path
See merge request pleroma/pleroma!95
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/upload.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 8a9dc612a..e5df94009 100644 --- 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 dde4e3ffe..dfafc95f4 100644 --- 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, |