release runtime provider fix for paths

3 files changed, 10 insertions, 17 deletions

diff --git a/lib/pleroma/config/release_runtime_provider.ex b/lib/pleroma/config/release_runtime_provider.ex
index 46fa35559..e5e9d3dcd 100644
--- a/lib/pleroma/config/release_runtime_provider.ex
+++ b/lib/pleroma/config/release_runtime_provider.ex
@@ -11,10 +11,11 @@ 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 =
+      opts[:config_path] || System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
 
     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
@@ -32,10 +33,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
diff --git a/mix.exs b/mix.exs
index 7328b533b..fe5d9d963 100644
--- a/mix.exs
+++ b/mix.exs
@@ -38,7 +38,7 @@ defmodule Pleroma.Mixfile do
           include_executables_for: [:unix],
           applications: [ex_syslogger: :load, syslog: :load, eldap: :transient],
           steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1],
-          config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, release_config_paths()}]
+          config_providers: [{Pleroma.Config.ReleaseRuntimeProvider, []}]
         ]
       ]
     ]
@@ -67,17 +67,6 @@ defmodule Pleroma.Mixfile do
     release
   end
 
-  defp release_config_paths do
-    config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
-
-    exported_config_path =
-      config_path
-      |> Path.dirname()
-      |> Path.join("#{Mix.env()}.exported_from_db.secret.exs")
-
-    [config_path: config_path, exported_config_path: exported_config_path]
-  end
-
   # Configuration for the OTP application.
   #
   # Type `mix help compile.app` for more information.
diff --git a/test/pleroma/config/release_runtime_provider_test.exs b/test/pleroma/config/release_runtime_provider_test.exs
index 1921698c5..6578d3268 100644
--- a/test/pleroma/config/release_runtime_provider_test.exs
+++ b/test/pleroma/config/release_runtime_provider_test.exs
@@ -8,7 +8,6 @@ defmodule Pleroma.Config.ReleaseRuntimeProviderTest do
       ExUnit.CaptureIO.capture_io(fn ->
         merged = ReleaseRuntimeProvider.load([], [])
         assert merged == Pleroma.Config.Holder.release_defaults()
-        IO.inspect(merged)
       end) =~
         "!!! Config path is not declared! Please ensure it exists and that PLEROMA_CONFIG_PATH is unset or points to an existing file"
     end