dynamic_configuration renaming
and moving it from instance settings
This commit is contained in:
parent
958d0452e4
commit
7d128ca208
13 changed files with 59 additions and 53 deletions
|
|
@ -30,7 +30,7 @@ defmodule Mix.Tasks.Pleroma.Config do
|
|||
def run(["migrate_to_db"]) do
|
||||
start_pleroma()
|
||||
|
||||
if Pleroma.Config.get([:instance, :dynamic_configuration]) do
|
||||
if Pleroma.Config.get([:configurable_from_database]) do
|
||||
Enum.each(@groups, &load_and_create(&1))
|
||||
else
|
||||
Mix.shell().info(
|
||||
|
|
@ -48,7 +48,8 @@ defmodule Mix.Tasks.Pleroma.Config do
|
|||
aliases: [d: :delete_from_db]
|
||||
)
|
||||
|
||||
with {:active?, true} <- {:active?, Pleroma.Config.get([:instance, :dynamic_configuration])},
|
||||
with {:active?, true} <-
|
||||
{:active?, Pleroma.Config.get([:configurable_from_database])},
|
||||
env_path when is_binary(env_path) <- opts[:env],
|
||||
config_path <- "config/#{env_path}.exported_from_db.secret.exs",
|
||||
{:ok, file} <- File.open(config_path, [:write, :utf8]) do
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ defmodule Pleroma.Config.TransferTask do
|
|||
end
|
||||
|
||||
def load_and_update_env do
|
||||
with true <- Pleroma.Config.get([:instance, :dynamic_configuration]),
|
||||
with true <- Pleroma.Config.get([:configurable_from_database]),
|
||||
true <- Ecto.Adapters.SQL.table_exists?(Repo, "config"),
|
||||
started_applications <- Application.started_applications() do
|
||||
# We need to restart applications for loaded settings take effect
|
||||
|
|
|
|||
|
|
@ -785,7 +785,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
end
|
||||
|
||||
def migrate_from_db(conn, _params) do
|
||||
with :ok <- check_dynamic_configuration(conn) do
|
||||
with :ok <- configurable_from_database(conn) do
|
||||
Mix.Tasks.Pleroma.Config.run([
|
||||
"migrate_from_db",
|
||||
"--env",
|
||||
|
|
@ -798,7 +798,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
end
|
||||
|
||||
def config_show(conn, _params) do
|
||||
with :ok <- check_dynamic_configuration(conn) do
|
||||
with :ok <- configurable_from_database(conn) do
|
||||
configs = Pleroma.Repo.all(Config)
|
||||
|
||||
if configs == [] do
|
||||
|
|
@ -812,7 +812,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
end
|
||||
|
||||
def config_update(conn, %{"configs" => configs}) do
|
||||
with :ok <- check_dynamic_configuration(conn) do
|
||||
with :ok <- configurable_from_database(conn) do
|
||||
updated =
|
||||
Enum.map(configs, fn
|
||||
%{"group" => group, "key" => key, "delete" => true} = params ->
|
||||
|
|
@ -843,8 +843,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
|
|||
end
|
||||
end
|
||||
|
||||
defp check_dynamic_configuration(conn) do
|
||||
if Pleroma.Config.get([:instance, :dynamic_configuration]) do
|
||||
defp configurable_from_database(conn) do
|
||||
if Pleroma.Config.get([:configurable_from_database]) do
|
||||
:ok
|
||||
else
|
||||
errors(conn, {:error, "To use this endpoint you need to enable dynamic configuration."})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue