Remove `httpoison` from dependencies

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index 5484c43ef53a299e5da4099b9bb02cbc523d04be..518de590dfb8df999929aaff545713ce74360549 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
   def project do
     [
       app: :pleroma,
-      version: version("0.9.0"),
+      version: version("1.0.0"),
       elixir: "~> 1.7",
       elixirc_paths: elixirc_paths(Mix.env()),
       compilers: [:phoenix, :gettext] ++ Mix.compilers(),
@@ -37,7 +37,7 @@ defmodule Pleroma.Mixfile do
         pleroma: [
           include_executables_for: [:unix],
           applications: [ex_syslogger: :load, syslog: :load],
-          steps: [:assemble, &copy_files/1]
+          steps: [:assemble, &copy_files/1, &copy_nginx_config/1]
         ]
       ]
     ]
@@ -48,6 +48,15 @@ defmodule Pleroma.Mixfile do
     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
+
   # Configuration for the OTP application.
   #
   # Type `mix help compile.app` for more information.
@@ -100,7 +109,6 @@ defmodule Pleroma.Mixfile do
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
-      {:httpoison, "~> 1.2.0"},
       {:poison, "~> 3.0", override: true},
       {:tesla, "~> 1.2"},
       {:jason, "~> 1.0"},
@@ -198,6 +206,15 @@ defmodule Pleroma.Mixfile do
 
     env_name = if Mix.env() != :prod, do: to_string(Mix.env())
 
+    env_override = System.get_env("PLEROMA_BUILD_ENV")
+
+    env_name =
+      if env_override do
+        if env_override != "prod", do: env_override
+      else
+        env_name
+      end
+
     build =
       [build_name, env_name]
       |> Enum.filter(fn string -> string && string != "" end)