From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 13 Jul 2020 13:39:56 +0000 (-0500)
Subject: Pick up env for both source and OTP installs
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e1908a5270d7b060238c9bc8bcd2808c705c27d9;p=akkoma

Pick up env for both source and OTP installs
---

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 38c6a6f1d..7e2164181 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -83,7 +83,7 @@ defmodule Mix.Tasks.Pleroma.Config do
 
   defp migrate_from_db(opts) do
     if Pleroma.Config.get([:configurable_from_database]) do
-      env = opts[:env] || Mix.env()
+      env = opts[:env] || Pleroma.Config.get(:env)
 
       config_path =
         if Pleroma.Config.get(:release) do