projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
[akkoma]
/
lib
/
pleroma
/
config
/
release_runtime_provider.ex
diff --git
a/lib/pleroma/config/release_runtime_provider.ex
b/lib/pleroma/config/release_runtime_provider.ex
index 8227195dcc58b2dde42e8baf92ec756843423dc1..e5e9d3dcd2c2a1019d990e76bfdaa9abb154e589 100644
(file)
--- a/
lib/pleroma/config/release_runtime_provider.ex
+++ b/
lib/pleroma/config/release_runtime_provider.ex
@@
-1,6
+1,6
@@
defmodule Pleroma.Config.ReleaseRuntimeProvider do
@moduledoc """
defmodule Pleroma.Config.ReleaseRuntimeProvider do
@moduledoc """
- Imports
`runtime.exs` and `{env}.exported_from_db.secret.exs` for elixi
r releases.
+ Imports
runtime config and `{env}.exported_from_db.secret.exs` fo
r releases.
"""
@behaviour Config.Provider
"""
@behaviour Config.Provider
@@
-8,10
+8,11
@@
defmodule Pleroma.Config.ReleaseRuntimeProvider do
def init(opts), do: opts
@impl true
def init(opts), do: opts
@impl true
- 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 = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
+ config_path =
+ opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
with_runtime_config =
if File.exists?(config_path) do
with_runtime_config =
if File.exists?(config_path) do
@@
-24,7
+25,7
@@
defmodule Pleroma.Config.ReleaseRuntimeProvider do
warning = [
IO.ANSI.red(),
IO.ANSI.bright(),
warning = [
IO.ANSI.red(),
IO.ANSI.bright(),
- "!!!
#{config_path} not foun
d! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
+ "!!!
Config path is not declare
d! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
IO.ANSI.reset()
]
IO.ANSI.reset()
]
@@
-33,13
+34,14
@@
defmodule Pleroma.Config.ReleaseRuntimeProvider do
end
exported_config_path =
end
exported_config_path =
- config_path
- |> Path.dirname()
- |> Path.join("prod.exported_from_db.secret.exs")
+ opts[:exported_config_path] ||
+ config_path
+ |> Path.dirname()
+ |> Path.join("#{Pleroma.Config.get(:env)}.exported_from_db.secret.exs")
with_exported =
if File.exists?(exported_config_path) do
with_exported =
if File.exists?(exported_config_path) do
- exported_config = Config.Reader.read!(
with_runtime_config
)
+ exported_config = Config.Reader.read!(
exported_config_path
)
Config.Reader.merge(with_runtime_config, exported_config)
else
with_runtime_config
Config.Reader.merge(with_runtime_config, exported_config)
else
with_runtime_config