Merge branch 'develop' into issue/1383

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index a737c98af40ed30941c184d34d7e696be88636d8..bbd8f7d781d4088229ab55d954e1b5d09c84975d 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -56,6 +56,8 @@ config :pleroma, Pleroma.Captcha,
   seconds_valid: 60,
   method: Pleroma.Captcha.Native
 
+config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
+
 config :pleroma, :hackney_pools,
   federation: [
     max_connections: 50,
@@ -609,6 +611,8 @@ config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000
 
+config :pleroma, :modules, runtime_dir: "instance/modules"
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"