From: rinpatch <rinpatch@sdf.org>
Date: Thu, 20 Jun 2019 21:25:34 +0000 (+0000)
Subject: Merge branch 'fix/config-gen-releases' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2437f5128407bbcdfc152ea3f008d7eecc1728f2;p=akkoma

Merge branch 'fix/config-gen-releases' into 'develop'

Refactor mix tasks a bit and make config generator work with releases

See merge request pleroma/pleroma!1312
---

2437f5128407bbcdfc152ea3f008d7eecc1728f2
diff --cc lib/mix/tasks/pleroma/config.ex
index d008871a1,4bbb42cea..cc5425362
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@@ -37,13 -37,12 +37,13 @@@ defmodule Mix.Tasks.Pleroma.Config d
    end
  
    def run(["migrate_from_db", env]) do
-     Common.start_pleroma()
+     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 ->