X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fconfig%2Frelease_runtime_provider.ex;h=e5f2d6339676bb21cbbe6becc9f4322e66a0b087;hb=5624366056b026b17439756a3057676308e7f7d9;hp=46fa355591c77ad0b76d516d6dc4bafe2e6658e9;hpb=4d046afd2769cfdc16b2ee48e8c1d8f7f8e8ffa7;p=akkoma

diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex
index 46fa35559..e5f2d6339 100644
--- a/lib/pleroma/config/release_runtime_provider.ex
+++ b/lib/pleroma/config/release_runtime_provider.ex
@@ -11,10 +11,17 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
   def load(config, opts) do
     with_defaults = Config.Reader.merge(config, Pleroma.Config.Holder.release_defaults())
 
-    config_path = opts[:config_path]
+    config_path =
+      cond do
+        opts[:config_path] -> opts[:config_path]
+        System.get_env("AKKOMA_CONFIG_PATH") -> System.get_env("AKKOMA_CONFIG_PATH")
+        System.get_env("PLEROMA_CONFIG_PATH") -> System.get_env("PLEROMA_CONFIG_PATH")
+        File.exists?("/etc/pleroma/config.exs") -> "/etc/pleroma/config.exs"
+        true -> "/etc/akkoma/config.exs"
+      end
 
     with_runtime_config =
-      if config_path && File.exists?(config_path) do
+      if File.exists?(config_path) do
         runtime_config = Config.Reader.read!(config_path)
 
         with_defaults
@@ -24,7 +31,7 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
         warning = [
           IO.ANSI.red(),
           IO.ANSI.bright(),
-          "!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file",
+          "!!! Config path is not declared! Please ensure it exists and that AKKOMA_CONFIG_PATH and/or PLEROMA_CONFIG_PATH is unset or points to an existing file",
           IO.ANSI.reset()
         ]
 
@@ -32,10 +39,14 @@ defmodule Pleroma.Config.ReleaseRuntimeProvider do
         with_defaults
       end
 
-    exported_config_path = opts[:exported_config_path]
+    exported_config_path =
+      opts[:exported_config_path] ||
+        config_path
+        |> Path.dirname()
+        |> Path.join("#{Pleroma.Config.get(:env)}.exported_from_db.secret.exs")
 
     with_exported =
-      if exported_config_path && File.exists?(exported_config_path) do
+      if File.exists?(exported_config_path) do
         exported_config = Config.Reader.read!(exported_config_path)
         Config.Reader.merge(with_runtime_config, exported_config)
       else