From: lain <lain@soykaf.club>
Date: Thu, 3 Sep 2020 09:29:39 +0000 (+0200)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma... 
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f26b580e80e57f162442e6f0c3bc0072cb935ce3;hp=-c;p=akkoma

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
---

f26b580e80e57f162442e6f0c3bc0072cb935ce3
diff --combined lib/mix/tasks/pleroma/frontend.ex
index 0a48be1fe,484af6da7..1957b1d84
--- a/lib/mix/tasks/pleroma/frontend.ex
+++ b/lib/mix/tasks/pleroma/frontend.ex
@@@ -69,7 -69,7 +69,7 @@@ defmodule Mix.Tasks.Pleroma.Frontend d
  
      fe_label = "#{frontend} (#{ref})"
  
 -    tmp_dir = Path.join(dest, "tmp")
 +    tmp_dir = Path.join([instance_static_dir, "frontends", "tmp"])
  
      with {_, :ok} <-
             {:download_or_unzip, download_or_unzip(frontend_info, tmp_dir, options[:file])},
@@@ -124,7 -124,9 +124,9 @@@
      url = String.replace(frontend_info["build_url"], "${ref}", frontend_info["ref"])
  
      with {:ok, %{status: 200, body: zip_body}} <-
-            Pleroma.HTTP.get(url, [], timeout: 120_000, recv_timeout: 120_000) do
+            Pleroma.HTTP.get(url, [],
+              adapter: [pool: :media, timeout: 120_000, recv_timeout: 120_000]
+            ) do
        unzip(zip_body, dest)
      else
        e -> {:error, e}
@@@ -133,7 -135,6 +135,7 @@@
  
    defp install_frontend(frontend_info, source, dest) do
      from = frontend_info["build_dir"] || "dist"
 +    File.rm_rf!(dest)
      File.mkdir_p!(dest)
      File.cp_r!(Path.join([source, from]), dest)
      :ok