AkkomaGang/akkoma
AkkomaGang
/
akkoma
13
63
Fork 83
Code Issues 172 Pull Requests 15 Packages Projects 2 Releases 13 Wiki Activity

Update sample config files #48

Merged
floatingghost merged 19 commits from norm/akkoma:config-files into develop 2022-07-06 18:50:02 +00:00
Conversation 2 Commits 19 Files Changed 29 +7 -2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 271e08fa48 - Show all commits

9
lib/pleroma/config/release_runtime_provider.ex
View File

@ -12,8 +12,13 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
config_path =
opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/akkoma/config.exs" ||
"/etc/pleroma/config.exs"
cond do
norm marked this conversation as resolved
floatingghost commented 2022-07-06 18:32:17 +00:00
Review
Copy Link

you can probably merge in the other change to remove this from the diff

you can probably merge in the other change to remove this from the diff
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