aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-06-17 09:15:35 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-06-17 09:15:35 +0300
commit02a5648febb8a508116c29e2271e1ade2ffafb2d (patch)
treea9d1e36d8f8716c99216f36fb76f664dc99997ee /lib
parentbb68f9d27c81759132dc791c9fabdb54fbb5341d (diff)
downloadpleroma-02a5648febb8a508116c29e2271e1ade2ffafb2d.tar.gz
fixed migration the settings to DB
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/pleroma/config.ex1
-rw-r--r--lib/pleroma/config/loader.ex1
2 files changed, 1 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/config.ex b/lib/mix/tasks/pleroma/config.ex
index f1b3a8766..65691f9c1 100644
--- a/lib/mix/tasks/pleroma/config.ex
+++ b/lib/mix/tasks/pleroma/config.ex
@@ -52,6 +52,7 @@ defmodule Mix.Tasks.Pleroma.Config do
defp do_migrate_to_db(config_file) do
if File.exists?(config_file) do
+ shell_info("Running migrate settings from file: #{Path.expand(config_file)}")
Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
diff --git a/lib/pleroma/config/loader.ex b/lib/pleroma/config/loader.ex
index 0f3ecf1ed..76559e70c 100644
--- a/lib/pleroma/config/loader.ex
+++ b/lib/pleroma/config/loader.ex
@@ -8,7 +8,6 @@ defmodule Pleroma.Config.Loader do
Pleroma.Web.Endpoint,
:env,
:configurable_from_database,
- :database,
:swarm
]