AkkomaGang/akkoma
AkkomaGang/akkoma
15
67
Fork 93
Code Issues 176 Pull requests 15 Projects 2 Releases 16 Packages Wiki Activity

Fix config path lookup #139

Merged
floatingghost merged 2 commits from norm/akkoma:fix/config-path into develop 2022-08-03 10:52:21 +00:00
Conversation 1 Commits 2 Files changed 1 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f41b84b989 - Show all commits

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

@ -14,10 +14,10 @@ def load(config, opts) do
config_path = config_path =
cond do cond do
opts[:config_path] -> opts[:config_path] 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") System.get_env("AKKOMA_CONFIG_PATH") -> System.get_env("AKKOMA_CONFIG_PATH")
File.exists?("/etc/akkoma/config.exs") -> "/etc/akkoma/config.exs" System.get_env("PLEROMA_CONFIG_PATH") -> System.get_env("PLEROMA_CONFIG_PATH")
true -> "/etc/pleroma/config.exs" File.exists?("/etc/pleroma/config.exs") -> "/etc/pleroma/config.exs"
true -> "/etc/akkoma/config.exs"
end end
with_runtime_config = with_runtime_config =