Replace Mix.env with Pleroma.Config.get(:env)

Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.

diff --git a/config/config.exs b/config/config.exs
index 4e2b1703bc519400416b54c3690bc24555e99a83..c6bf71fc83ee76fa43f965610972c864c7657ee4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -500,6 +500,8 @@ config :pleroma, :oauth2,
 
 config :pleroma, :database, rum_enabled: false
 
+config :pleroma, :env, Mix.env()
+
 config :http_signatures,
   adapter: Pleroma.Signature
 

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 69a8a576117ac46af5fc303b7c44ab7fe8538e5c..5627d20af969dbce9985c97aa86ff71e5cef46ba 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -194,7 +194,7 @@ defmodule Pleroma.Application do
       end
   end
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     defp streamer_child, do: []
     defp chat_child, do: []
   else

diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex
index 485ddfbc72ef03263199aaa4d4abd6c16829daa1..a7cc228318af06514ae7a74ca15d3478d56816c7 100644 (file)
--- a/lib/pleroma/plugs/http_security_plug.ex
+++ b/lib/pleroma/plugs/http_security_plug.ex
@@ -56,14 +56,14 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do
     connect_src = "connect-src 'self' #{static_url} #{websocket_url}"
 
     connect_src =
-      if Mix.env() == :dev do
+      if Pleroma.Config.get(:env) == :dev do
         connect_src <> " http://localhost:3035/"
       else
         connect_src
       end
 
     script_src =
-      if Mix.env() == :dev do
+      if Pleroma.Config.get(:env) == :dev do
         "script-src 'self' 'unsafe-eval'"
       else
         "script-src 'self'"

diff --git a/lib/pleroma/web/federator/retry_queue.ex b/lib/pleroma/web/federator/retry_queue.ex
index 71e49494fd5a381616b6ed7a7eb324cba0112558..3db948c2edf7540b09d61ccfd1c3b03bd716a416 100644 (file)
--- a/lib/pleroma/web/federator/retry_queue.ex
+++ b/lib/pleroma/web/federator/retry_queue.ex
@@ -15,7 +15,9 @@ defmodule Pleroma.Web.Federator.RetryQueue do
 
   def start_link do
     enabled =
-      if Mix.env() == :test, do: true, else: Pleroma.Config.get([__MODULE__, :enabled], false)
+      if Pleroma.Config.get(:env) == :test,
+        do: true,
+        else: Pleroma.Config.get([__MODULE__, :enabled], false)
 
     if enabled do
       Logger.info("Starting retry queue")
@@ -219,7 +221,7 @@ defmodule Pleroma.Web.Federator.RetryQueue do
     {:noreply, state}
   end
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     defp growth_function(_retries) do
       _shutit = Pleroma.Config.get([__MODULE__, :initial_timeout])
       DateTime.to_unix(DateTime.utc_now()) - 1

diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index 26eb614a6e3b559609b45867506b719cd6d98906..d376e2069fb370264c508bdf5a4bb302aaaf2467 100644 (file)
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.RelMe do
     with_body: true
   ]
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     def parse(url) when is_binary(url), do: parse_url(url)
   else
     def parse(url) when is_binary(url) do

diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index e4595800c2f04afebbb40b381d5a28aa2eaf9b8a..21cd47890abc8a17fa583241cdd8f970a91d3be4 100644 (file)
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -18,7 +18,7 @@ defmodule Pleroma.Web.RichMedia.Parser do
 
   def parse(nil), do: {:error, "No URL provided"}
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     def parse(url), do: parse_url(url)
   else
     def parse(url) do

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e699f6ae2e162fe1efcaeccd0f21c38555b3cbb0..1b37d6a932022ac8174ec9493b8fe288d92f4075 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -699,7 +699,7 @@ defmodule Pleroma.Web.Router do
     get("/:sig/:url/:filename", MediaProxyController, :remote)
   end
 
-  if Mix.env() == :dev do
+  if Pleroma.Config.get(:env) == :dev do
     scope "/dev" do
       pipe_through([:mailbox_preview])
 

diff --git a/lib/pleroma/web/views/error_view.ex b/lib/pleroma/web/views/error_view.ex
index f4c04131c949708251e4bdd95a045ecd02f7c1d3..5cb8669fe413b7f28d5215f34a2d4f8efed11cc1 100644 (file)
--- a/lib/pleroma/web/views/error_view.ex
+++ b/lib/pleroma/web/views/error_view.ex
@@ -13,7 +13,7 @@ defmodule Pleroma.Web.ErrorView do
   def render("500.json", assigns) do
     Logger.error("Internal server error: #{inspect(assigns[:reason])}")
 
-    if Mix.env() != :prod do
+    if Pleroma.Config.get(:env) != :prod do
       %{errors: %{detail: "Internal server error", reason: inspect(assigns[:reason])}}
     else
       %{errors: %{detail: "Internal server error"}}