Merge branch 'develop' into fix-config-path

Fix config path lookup
Add /etc/akkoma in the config search path
2022-07-06 15:24:23 +00:00 · 2022-07-06 07:53:38 -04:00 · 2022-07-06 07:53:38 -04:00
1 changed files with 7 additions and 1 deletions
--- a/lib/pleroma/config/release_runtime_provider.ex
+++ b/lib/pleroma/config/release_runtime_provider.ex
@ -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
Author	SHA1	Message	Date
norm	9e0d5370e9	Merge branch 'develop' into fix-config-path All checks were successful ci/woodpecker/pr/release Pipeline was successful Details ci/woodpecker/pr/lint Pipeline was successful Details ci/woodpecker/pr/test Pipeline was successful Details	2022-07-06 15:24:23 +00:00
Norm	6ccb081b80	Fix config path lookup Some checks failed ci/woodpecker/pr/release Pipeline was successful Details ci/woodpecker/pr/lint Pipeline was successful Details ci/woodpecker/pr/test Pipeline failed Details	2022-07-06 07:53:38 -04:00
Norm	4833bc927e	Add /etc/akkoma in the config search path Keeping /etc/pleroma to ease migration from Pleroma.	2022-07-06 07:53:38 -04:00