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

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index c3094eb2b16796b17ebbe574f54071e3e02a37cd..32029699129892006180f436d1b51e7b1ead1961 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -74,7 +74,13 @@ config :pleroma, :instance,
   rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy,
   public: true,
   quarantined_instances: [],
-  managed_config: true
+  managed_config: true,
+  allowed_post_formats: [
+    "text/plain",
+    "text/html",
+    "text/markdown"
+  ],
+  mrf_transparency: true
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
@@ -104,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