Merge branch 'security/clear-oauth-with-password' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 608c035b00b9ae2af84fdde1ca8fc67d2e3c5337..32029699129892006180f436d1b51e7b1ead1961 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -79,7 +79,8 @@ config :pleroma, :instance,
     "text/plain",
     "text/html",
     "text/markdown"
-  ]
+  ],
+  mrf_transparency: true
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -109,7 +110,8 @@ config :pleroma, :fe,
 config :pleroma, :activitypub,
   accept_blocks: true,
   unfollow_blocked: true,
-  outgoing_blocks: true
+  outgoing_blocks: true,
+  follow_handshake_timeout: 500
 
 config :pleroma, :user, deny_follow_blocked: true