nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

release runtime provider fix for paths

Browse source
This commit is contained in:
Alexander Strizhakov 2021-04-08 15:45:31 +03:00
parent 4d046afd27
commit 681a42c359
No known key found for this signature in database
GPG key ID: 022896A53AEF1381
3 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/pleroma/config/release_runtime_provider.ex
View file

@ -11,10 +11,11 @@ def init(opts), do: opts
def load(config, opts) do def load(config, opts) do
with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults()) with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
config_path = opts[:config_path] config_path =
opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
with_runtime_config = with_runtime_config =
if config_path && File.exists?(config_path) do if File.exists?(config_path) do
runtime_config = Config.Reader.read!(config_path) runtime_config = Config.Reader.read!(config_path)
with_defaults with_defaults
@ -32,10 +33,14 @@ def load(config, opts) do
with_defaults with_defaults
end end
exported_config_path = opts[:exported_config_path] exported_config_path =
opts[:exported_config_path] ||
config_path
|> Path.dirname()
|> Path.join("#{Pleroma.Config.get(:env)}.exported_from_db.secret.exs")
with_exported = with_exported =
if exported_config_path && File.exists?(exported_config_path) do if File.exists?(exported_config_path) do
exported_config = Config.Reader.read!(exported_config_path) exported_config = Config.Reader.read!(exported_config_path)
Config.Reader.merge(with_runtime_config, exported_config) Config.Reader.merge(with_runtime_config, exported_config)
else else

13
mix.exs
View file

@ -38,7 +38,7 @@ def project do
include_executables_for: [:unix], include_executables_for: [:unix],
applications: [ex_syslogger: :load, syslog: :load, eldap: :transient], applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1], steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1],
config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, release_config_paths()}] config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}]
] ]
] ]
] ]
@ -67,17 +67,6 @@ def copy_nginx_config(%{path: target_path} = release) do
release release
end end
defp release_config_paths do
config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
exported_config_path =
config_path
|> Path.dirname()
|> Path.join("#{Mix.env()}.exported_from_db.secret.exs")
[config_path: config_path, exported_config_path: exported_config_path]
end
# Configuration for the OTP application. # Configuration for the OTP application.
# #
# Type `mix help compile.app` for more information. # Type `mix help compile.app` for more information.

1
test/pleroma/config/release_runtime_provider_test.exs
View file

@ -8,7 +8,6 @@ test "loads release defaults config and warns about non-existent runtime config"
ExUnit.CaptureIO.capture_io(fn -> ExUnit.CaptureIO.capture_io(fn ->
merged = ReleaseRuntimeProvider.load([], []) merged = ReleaseRuntimeProvider.load([], [])
assert merged == Pleroma.Config.Holder.release_defaults() assert merged == Pleroma.Config.Holder.release_defaults()
IO.inspect(merged)
end) =~ end) =~
"!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file" "!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file"
end end