From 4833bc927e9f360fb2870ad18e54558b5fc1fe9a Mon Sep 17 00:00:00 2001 From: Norm Date: Tue, 5 Jul 2022 06:01:25 -0400 Subject: [PATCH 1/2] Add /etc/akkoma in the config search path Keeping /etc/pleroma to ease migration from Pleroma. --- lib/pleroma/config/release_runtime_provider.ex | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex index e5e9d3dcd..567229196 100644 --- a/lib/pleroma/config/release_runtime_provider.ex +++ b/lib/pleroma/config/release_runtime_provider.ex @@ -12,7 +12,8 @@ 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/pleroma/config.exs" + opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/akkoma/config.exs" || + "/etc/pleroma/config.exs" with_runtime_config = if File.exists?(config_path) do -- 2.34.1 From 6ccb081b80854a67a5d59ad49aa49736512691cc Mon Sep 17 00:00:00 2001 From: Norm Date: Tue, 5 Jul 2022 07:33:25 -0400 Subject: [PATCH 2/2] Fix config path lookup --- lib/pleroma/config/release_runtime_provider.ex | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex index 567229196..1e4bddc59 100644 --- a/lib/pleroma/config/release_runtime_provider.ex +++ b/lib/pleroma/config/release_runtime_provider.ex @@ -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 + 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 -- 2.34.1