X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=bd8a10c66f9e5baa589832acef2d09b294416e1e;hb=23608149bc72d740e6259e460e43ff276583516d;hp=7f8e36cbb98157ec32a52a998cede2ecd3b65ee0;hpb=e4fa6b99ac963fda72bf3ffc22da10346f4af839;p=akkoma

diff --git a/mix.exs b/mix.exs
index 7f8e36cbb..bd8a10c66 100644
--- a/mix.exs
+++ b/mix.exs
@@ -37,14 +37,23 @@ defmodule Pleroma.Mixfile do
         pleroma: [
           include_executables_for: [:unix],
           applications: [ex_syslogger: :load, syslog: :load],
-          steps: [:assemble, &copy_pleroma_ctl/1]
+          steps: [:assemble, &copy_files/1, &copy_nginx_config/1]
         ]
       ]
     ]
   end
 
-  def copy_pleroma_ctl(%{path: target_path} = release) do
-    File.cp!("./rel/pleroma_ctl", Path.join([target_path, "bin", "pleroma_ctl"]))
+  def copy_files(%{path: target_path} = release) do
+    File.cp_r!("./rel/files", target_path)
+    release
+  end
+
+  def copy_nginx_config(%{path: target_path} = release) do
+    File.cp!(
+      "./installation/pleroma.nginx",
+      Path.join([target_path, "installation", "pleroma.nginx"])
+    )
+
     release
   end
 
@@ -209,6 +218,7 @@ defmodule Pleroma.Mixfile do
 
     branch_name =
       with {branch_name, 0} <- System.cmd("git", ["rev-parse", "--abbrev-ref", "HEAD"]),
+           branch_name <- System.get_env("PLEROMA_BUILD_BRANCH") || branch_name,
            true <- branch_name != "master" do
         branch_name =
           String.trim(branch_name)