Move runtime configuration from `:instance` to `:modules`

diff --git a/config/config.exs b/config/config.exs
index e1358eda0184cf76db896d3967fbbe7921de350a..64e33c82f90c5e4ef5df95e97d481002226a370c 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -249,7 +249,6 @@ config :pleroma, :instance,
   quarantined_instances: [],
   managed_config: true,
   static_dir: "instance/static/",
-  custom_modules_dir: "instance/modules/",
   allowed_post_formats: [
     "text/plain",
     "text/html",
@@ -618,6 +617,8 @@ config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000
 
+config :pleroma, :modules, runtime_dir: "instance/modules"
+
 config :swarm, node_blacklist: [~r/myhtml_.*$/]
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.

diff --git a/config/releases.exs b/config/releases.exs
index 98c5ceccd54a5501dfefcd8a845d148aedca390f..b224960dbff578a365455902e8a544d9edbb501e 100644 (file)
--- a/config/releases.exs
+++ b/config/releases.exs
@@ -2,6 +2,7 @@ import Config
 
 config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
 config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads"
+config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules"
 
 config_path = System.get_env("PLEROMA_CONFIG_PATH") || "/etc/pleroma/config.exs"
 

diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index f73d368c1bc3a869b4b072bae771f0676de16483..413a668c6f93c08ee7bad32897000305e0a7be31 100644 (file)
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -68,8 +68,6 @@ You shouldn't edit the base config directly to avoid breakages and merge conflic
 * `account_field_name_length`: An account field name maximum length (default: `512`).
 * `account_field_value_length`: An account field value maximum length (default: `2048`).
 * `external_user_synchronization`: Enabling following/followers counters synchronization for external users.
-* `custom_modules_dir`: A path to custom Elixir modules (such as MRF policies).
-
 
 !!! danger
     This is a Work In Progress, not usable just yet
@@ -831,3 +829,13 @@ config :auto_linker,
     rel: "ugc"
   ]
 ```
+
+## Custom Runtime Modules (`:modules`)
+
+* `runtime_dir`: A path to custom Elixir modules (such as MRF policies).
+
+Example:
+
+```elixir
+config :pleroma, :modules, runtime_dir: "/var/lib/pleroma/modules"
+```

diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index 73364f1411da2cf08227772b9cfc0fb44f3a2166..9d2f3f3205cf53771438f75663be60026eec0fde 100644 (file)
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -69,7 +69,7 @@ defmodule Pleroma.Application do
   end
 
   def load_custom_modules do
-    dir = Pleroma.Config.get([:instance, :custom_modules_dir])
+    dir = Pleroma.Config.get([:modules, :runtime_dir])
 
     if dir && File.exists?(dir) do
       dir