moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cleanup/unused-proxy-opts' into 'develop' 

Cleanup Pleroma.Upload proxy opts

See merge request pleroma/pleroma!3236
This commit is contained in:
lain 2021-01-07 16:25:39 +00:00
parent cf0eb0c1c5 d69c78ceb9
commit ac1298fce8
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/config.exs
View File

@ -63,14 +63,6 @@
filters: [Pleroma.Upload.Filter.Dedupe], filters: [Pleroma.Upload.Filter.Dedupe],
link_name: false, link_name: false,
proxy_remote: false, proxy_remote: false,
proxy_opts: [
redirect_on_failure: false,
max_body_length: 25 * 1_048_576,
http: [
follow_redirect: true,
pool: :upload
]
],
filename_display_max_length: 30, filename_display_max_length: 30,
default_description: nil default_description: nil

9
lib/pleroma/web/plugs/uploaded_media.ex
View File

@ -87,8 +87,15 @@ defp get_media(conn, {:static_dir, directory}, _, opts) do
end end
defp get_media(conn, {:url, url}, true, _) do defp get_media(conn, {:url, url}, true, _) do
proxy_opts = [
http: [
follow_redirect: true,
pool: :upload
]
]
conn conn
|> Pleroma.ReverseProxy.call(url, Pleroma.Config.get([Pleroma.Upload, :proxy_opts], [])) |> Pleroma.ReverseProxy.call(url, proxy_opts)
end end
defp get_media(conn, {:url, url}, _, _) do defp get_media(conn, {:url, url}, _, _) do