summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2019-12-06 15:04:46 +0700
committerEgor Kislitsyn <egor@kislitsyn.com>2019-12-06 15:04:46 +0700
commit157bceeda9124cea7ba69eaf6639ca52b3fac7c6 (patch)
treebb4b2b3c2199750002026b917b5d825ad41514fc /config/config.exs
parent1f3c452d864eff625dfd0f25c48abe0efef4507b (diff)
downloadpleroma-157bceeda9124cea7ba69eaf6639ca52b3fac7c6.tar.gz
pleroma-157bceeda9124cea7ba69eaf6639ca52b3fac7c6.zip
Move runtime configuration from `:instance` to `:modules`
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index e1358eda0..64e33c82f 100644
--- 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.