From 32320c1ee94a999082f10c9f9a3c6d55ced21e21 Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Thu, 20 Jun 2019 17:43:57 +0000
Subject: [PATCH] Fixes for dynamic configuration

---
 config/dev.exs                                   | 4 ++--
 config/prod.exs                                  | 4 ++--
 lib/mix/tasks/pleroma/config.ex                  | 3 ++-
 test/tasks/config_test.exs                       | 2 +-
 test/web/admin_api/admin_api_controller_test.exs | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/dev.exs b/config/dev.exs
index 71b11f7c3..7e1e3b4be 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -60,5 +60,5 @@ else
   )
 end
 
-if File.exists?("./config/dev.migrated.secret.exs"),
-  do: import_config("./config/dev.migrated.secret.exs")
+if File.exists?("./config/dev.exported_from_db.secret.exs"),
+  do: import_config("dev.exported_from_db.secret.exs")
diff --git a/config/prod.exs b/config/prod.exs
index 42edccf64..9c205cbd2 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -64,5 +64,5 @@ config :logger, level: :warn
 # which should be versioned separately.
 import_config "prod.secret.exs"
 
-if File.exists?("./config/prod.migrated.secret.exs"),
-  do: import_config("./config/prod.migrated.secret.exs")
+if File.exists?("./config/prod.exported_from_db.secret.exs"),
+  do: import_config("prod.exported_from_db.secret.exs")
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index 1fe03088d..d008871a1 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -40,9 +40,10 @@ defmodule Mix.Tasks.Pleroma.Config do
     Common.start_pleroma()
 
     if Pleroma.Config.get([:instance, :dynamic_configuration]) do
-      config_path = "config/#{env}.migrated.secret.exs"
+      config_path = "config/#{env}.exported_from_db.secret.exs"
 
       {:ok, file} = File.open(config_path, [:write])
+      IO.write(file, "use Mix.Config\r\n")
 
       Repo.all(Config)
       |> Enum.each(fn config ->
diff --git a/test/tasks/config_test.exs b/test/tasks/config_test.exs
index 7d3b1860c..d448b0444 100644
--- a/test/tasks/config_test.exs
+++ b/test/tasks/config_test.exs
@@ -5,7 +5,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
 
   setup_all do
     Mix.shell(Mix.Shell.Process)
-    temp_file = "config/temp.migrated.secret.exs"
+    temp_file = "config/temp.exported_from_db.secret.exs"
 
     dynamic = Pleroma.Config.get([:instance, :dynamic_configuration])
 
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
index 18f64f2b7..2a5912645 100644
--- a/test/web/admin_api/admin_api_controller_test.exs
+++ b/test/web/admin_api/admin_api_controller_test.exs
@@ -1334,7 +1334,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
     setup %{conn: conn} do
       admin = insert(:user, info: %{is_admin: true})
 
-      temp_file = "config/test.migrated.secret.exs"
+      temp_file = "config/test.exported_from_db.secret.exs"
 
       on_exit(fn ->
         Application.delete_env(:pleroma, :key1)
-- 
2.45.2