Merge branch 'issue/2069' into 'develop'

[akkoma] / lib / pleroma / config / holder.ex

diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index 0fa7c5bf745f674fd7949488330e13c6d4bda480..f037d5d483b2298e1b92c4b02ed5fcc056806af9 100644 (file)
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -1,29 +1,35 @@
-defmodule Pleroma.Config.Holder do
-  @config Pleroma.Config.Loader.load_and_merge()
-
-  @spec config() :: keyword()
-  def config do
-    @config
-    |> Keyword.keys()
-    |> Enum.map(&filter(&1, config(&1)))
-    |> List.flatten()
-  end
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
 
-  @spec config(atom()) :: any()
-  def config(group), do: @config[group]
+defmodule Pleroma.Config.Holder do
+  @config Pleroma.Config.Loader.default_config()
 
-  @spec config(atom(), atom()) :: any()
-  def config(group, key), do: @config[group][key]
+  @spec save_default() :: :ok
+  def save_default do
+    default_config =
+      if System.get_env("RELEASE_NAME") do
+        release_config =
+          [:code.root_dir(), "releases", System.get_env("RELEASE_VSN"), "releases.exs"]
+          |> Path.join()
+          |> Pleroma.Config.Loader.read()
 
-  defp filter(group, settings) when group not in [:swarm] do
-    filtered =
-      Enum.reject(settings, fn {k, _v} ->
-        k in [Pleroma.Repo, Pleroma.Web.Endpoint, :env, :configurable_from_database] or
-          (group == :phoenix and k == :serve_endpoints)
-      end)
+        Pleroma.Config.Loader.merge(@config, release_config)
+      else
+        @config
+      end
 
-    {group, filtered}
+    Pleroma.Config.put(:default_config, default_config)
   end
 
-  defp filter(_, _), do: []
+  @spec default_config() :: keyword()
+  def default_config, do: get_default()
+
+  @spec default_config(atom()) :: keyword()
+  def default_config(group), do: Keyword.get(get_default(), group)
+
+  @spec default_config(atom(), atom()) :: keyword()
+  def default_config(group, key), do: get_in(get_default(), [group, key])
+
+  defp get_default, do: Pleroma.Config.get(:default_config)
 end