Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream

[akkoma] / lib / mix / tasks / pleroma / config.ex

diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 343438addc6ccdfb3e186e01ee4670f4ecba336f..904c5a74b731e68a9f2a20560716d35a58ae01c4 100644 (file)
--- 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 = Mix.env()
+      env = opts[:env] || Pleroma.Config.get(:env)
 
       config_path =
         if Pleroma.Config.get(:release) do
@@ -105,7 +105,10 @@ defmodule Mix.Tasks.Pleroma.Config do
 
       :ok = File.close(file)
       System.cmd("mix", ["format", config_path])
-      shell_info("Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs")
+
+      shell_info(
+        "Database configuration settings have been exported to config/#{env}.exported_from_db.secret.exs"
+      )
     else
       migration_error()
     end