X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig%2Fholder.ex;h=d6bf948ae7c952b6221e0d5ce1ec1d7a12a7561b;hb=b71db2f82d91a6ae1406658374f15d948d8ad7e3;hp=88e1db3135bcd39ca948226e67e4356d2ca75b0a;hpb=282a93554fbf919ff553d839eeea98abe1f861d4;p=akkoma

diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index 88e1db313..d6bf948ae 100644
--- a/lib/pleroma/config/holder.ex
+++ b/lib/pleroma/config/holder.ex
@@ -1,40 +1,42 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.Holder do
   @config Pleroma.Config.Loader.default_config()
 
-  @spec to_ets() :: true
-  def to_ets do
-    :ets.new(:default_config, [:named_table, :protected])
-
+  @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)
+        Pleroma.Config.Loader.merge(@config, release_defaults())
       else
         @config
       end
 
-    :ets.insert(:default_config, {:config, default_config})
+    Pleroma.Config.put(:default_config, default_config)
   end
 
   @spec default_config() :: keyword()
-  def default_config, do: from_ets()
+  def default_config, do: get_default()
 
   @spec default_config(atom()) :: keyword()
-  def default_config(group), do: Keyword.get(from_ets(), group)
+  def default_config(group), do: Keyword.get(get_default(), group)
 
   @spec default_config(atom(), atom()) :: keyword()
-  def default_config(group, key), do: get_in(from_ets(), [group, key])
-
-  defp from_ets do
-    [{:config, default_config}] = :ets.lookup(:default_config, :config)
-    default_config
+  def default_config(group, key), do: get_in(get_default(), [group, key])
+
+  defp get_default, do: Pleroma.Config.get(:default_config)
+
+  @spec release_defaults() :: keyword()
+  def release_defaults do
+    [
+      pleroma: [
+        {:instance, [static_dir: "/var/lib/akkoma/static"]},
+        {Pleroma.Uploaders.Local, [uploads: "/var/lib/akkoma/uploads"]},
+        {:modules, [runtime_dir: "/var/lib/akkoma/modules"]},
+        {:release, true}
+      ]
+    ]
   end
 end