Merge branch 'docs/kyclos' into 'develop'

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

diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index 0fa7c5bf745f674fd7949488330e13c6d4bda480..d4fe892af73c36becca3658d27149574d1384b8d 100644 (file)
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -1,29 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 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
+  def config, do: @config
 
   @spec config(atom()) :: any()
   def config(group), do: @config[group]
 
   @spec config(atom(), atom()) :: any()
   def config(group, key), do: @config[group][key]
-
-  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
-
-  defp filter(_, _), do: []
 end