summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-12-21 11:56:24 +0000
committerrinpatch <rinpatch@sdf.org>2019-12-21 11:56:24 +0000
commitc51e93978ea2aa0f2d5bcc43bf7c925b2590eece (patch)
treea914a0129fcd6e42c2317254cec7411ec5045696 /config/config.exs
parent7447c80e33a7d54c3d9f03f5c0be3fb738f1318b (diff)
parentb9a87b1baa0650bfb4b699054304daae585a0e9a (diff)
downloadpleroma-c51e93978ea2aa0f2d5bcc43bf7c925b2590eece.tar.gz
pleroma-c51e93978ea2aa0f2d5bcc43bf7c925b2590eece.zip
Merge branch 'feature/custom-runtime-modules' into 'develop'
Add support for custom modules at runtime Closes #1448 See merge request pleroma/pleroma!2039
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 47098858b..5839cbe4a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -621,6 +621,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.