X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=mix.exs;h=518de590dfb8df999929aaff545713ce74360549;hb=11143c542a012f64db8db0fa7b82f063ef338e94;hp=9fdf6e83a3016098452a92fd6feed569352e486e;hpb=e3534f5b3c68f9bf6a10c5fc10aa637ef66ab82e;p=akkoma

diff --git a/mix.exs b/mix.exs
index 9fdf6e83a..518de590d 100644
--- 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"},
@@ -108,7 +116,7 @@ defmodule Pleroma.Mixfile do
       {:ex_aws, "~> 2.0"},
       {:ex_aws_s3, "~> 2.0"},
       {:earmark, "~> 1.3"},
-      {:bbcode, "~> 0.1"},
+      {:bbcode, "~> 0.1.1"},
       {:ex_machina, "~> 2.3", only: :test},
       {:credo, "~> 0.9.3", only: [:dev, :test]},
       {:mock, "~> 0.3.3", only: :test},
@@ -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)
@@ -213,7 +230,7 @@ defmodule Pleroma.Mixfile do
            true <- branch_name != "master" do
         branch_name =
           String.trim(branch_name)
-          |> String.replace(~r/\W+/, "-")
+          |> String.replace(~r/[^0-9a-z\-\.]+/i, "-")
 
         "-" <> branch_name
       end