X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fconfig%2Fholder.ex;h=4d186a8549be186ee6fba24c313cd722a2b198aa;hb=c1d63bbd9a4f39dbd92811b1720705342e5c914e;hp=88e1db3135bcd39ca948226e67e4356d2ca75b0a;hpb=282a93554fbf919ff553d839eeea98abe1f861d4;p=akkoma
diff --git a/lib/pleroma/config/holder.ex b/lib/pleroma/config/holder.ex
index 88e1db313..4d186a854 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
+# Copyright © 2017-2021 Pleroma Authors
# 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/pleroma/static"]},
+ {Pleroma.Uploaders.Local, [uploads: "/var/lib/pleroma/uploads"]},
+ {:modules, [runtime_dir: "/var/lib/pleroma/modules"]},
+ {:release, true}
+ ]
+ ]
end
end