projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start :ssl if not started when running migration or rollback
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
config.ex
diff --git
a/lib/mix/tasks/pleroma/config.ex
b/lib/mix/tasks/pleroma/config.ex
index 65691f9c1df91c1d982a3494371d37e842a0a936..904c5a74b731e68a9f2a20560716d35a58ae01c4 100644
(file)
--- a/
lib/mix/tasks/pleroma/config.ex
+++ b/
lib/mix/tasks/pleroma/config.ex
@@
-52,7
+52,7
@@
defmodule Mix.Tasks.Pleroma.Config do
defp do_migrate_to_db(config_file) do
if File.exists?(config_file) 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)}")
+ shell_info("
Migrating
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;")
Ecto.Adapters.SQL.query!(Repo, "TRUNCATE config;")
Ecto.Adapters.SQL.query!(Repo, "ALTER SEQUENCE config_id_seq RESTART;")
@@
-83,7
+83,7
@@
defmodule Mix.Tasks.Pleroma.Config do
defp migrate_from_db(opts) do
if Pleroma.Config.get([:configurable_from_database]) do
defp migrate_from_db(opts) do
if Pleroma.Config.get([:configurable_from_database]) do
- env = opts[:env] ||
"prod"
+ env = opts[:env] ||
Pleroma.Config.get(:env)
config_path =
if Pleroma.Config.get(:release) do
config_path =
if Pleroma.Config.get(:release) do
@@
-105,6
+105,10
@@
defmodule Mix.Tasks.Pleroma.Config do
:ok = File.close(file)
System.cmd("mix", ["format", config_path])
: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"
+ )
else
migration_error()
end
else
migration_error()
end
@@
-112,7
+116,7
@@
defmodule Mix.Tasks.Pleroma.Config do
defp migration_error do
shell_error(
defp migration_error do
shell_error(
- "Migration is not allowed in config. You can change this behavior by setting `config
urable_from_database` to true.
"
+ "Migration is not allowed in config. You can change this behavior by setting `config
:pleroma, configurable_from_database: true`
"
)
end
)
end