forked from AkkomaGang/akkoma
Fix config path lookup (#51)
Reviewed-on: AkkomaGang/akkoma#51 Co-authored-by: norm <normandy@biribiri.dev> Co-committed-by: norm <normandy@biribiri.dev>
This commit is contained in:
parent
1486ad0c6e
commit
3d9dabd914
1 changed files with 7 additions and 1 deletions
|
@ -12,7 +12,13 @@ def load(config, opts) do
|
|||
with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
|
||||
|
||||
config_path =
|
||||
opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
|
||||
cond do
|
||||
opts[:config_path] -> opts[:config_path]
|
||||
System.get_env("PLEROMA_CONFIG_PATH") -> System.get_env("PLEROMA_CONFIG_PATH")
|
||||
System.get_env("AKKOMA_CONFIG_PATH") -> System.get_env("AKKOMA_CONFIG_PATH")
|
||||
File.exists?("/etc/akkoma/config.exs") -> "/etc/akkoma/config.exs"
|
||||
true -> "/etc/pleroma/config.exs"
|
||||
end
|
||||
|
||||
with_runtime_config =
|
||||
if File.exists?(config_path) do
|
||||
|
|
Loading…
Reference in a new issue