Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

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

diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index aa35382b2eb1310684cbda96d6e2a463926e20ab..f037d5d483b2298e1b92c4b02ed5fcc056806af9 100644 (file)
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -1,51 +1,35 @@
-defmodule Pleroma.Config.Loader do
-  # TODO: add support for releases
-  if Code.ensure_loaded?(Config.Reader) do
-    @spec load() :: map()
-    def load do
-      config = Config.Reader.read!("config/config.exs")
-      env_config = Config.Reader.read!("config/#{Mix.env()}.exs")
-
-      Config.Reader.merge(config, env_config)
-    end
-  else
-    # support for Elixir less than 1.9
-    @spec load() :: map()
-    def load do
-      config = Mix.Config.eval!("config/config.exs")
-      env_config = Mix.Config.eval!("config/#{Mix.env()}.exs")
-
-      Mix.Config.merge(config, env_config)
-    end
-  end
-end
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.Holder do
-  @config Pleroma.Config.Loader.load()
-
-  @spec config() :: keyword()
-  def config do
-    @config
-    |> Keyword.keys()
-    |> Enum.map(&filter(&1, config(&1)))
-    |> List.flatten()
+  @config Pleroma.Config.Loader.default_config()
+
+  @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()
+
+        Pleroma.Config.Loader.merge(@config, release_config)
+      else
+        @config
+      end
+
+    Pleroma.Config.put(:default_config, default_config)
   end
 
-  @spec config(atom()) :: any()
-  def config(group), do: @config[group]
+  @spec default_config() :: keyword()
+  def default_config, do: get_default()
 
-  @spec config(atom(), atom()) :: any()
-  def config(group, key), do: @config[group][key]
+  @spec default_config(atom()) :: keyword()
+  def default_config(group), do: Keyword.get(get_default(), group)
 
-  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)
-
-    {group, filtered}
-  end
+  @spec default_config(atom(), atom()) :: keyword()
+  def default_config(group, key), do: get_in(get_default(), [group, key])
 
-  defp filter(_, _), do: []
+  defp get_default, do: Pleroma.Config.get(:default_config)
 end