[#1260] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 1988753d669f031f5bb1b600b1fd19a40cb8ec69..92adf442c669dfff66efc99f3eb91bebefb306c2 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -509,7 +509,7 @@ config :auto_linker,
     class: false,
     strip_prefix: false,
     new_window: false,
-    rel: false
+    rel: "ugc"
   ]
 
 config :pleroma, :ldap,
@@ -587,10 +587,12 @@ config :pleroma, :env, Mix.env()
 config :http_signatures,
   adapter: Pleroma.Signature
 
-config :pleroma, :rate_limit, nil
+config :pleroma, :rate_limit, authentication: {60_000, 15}
 
 config :pleroma, Pleroma.ActivityExpiration, enabled: true
 
+config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+
 config :pleroma, :web_cache_ttl,
   activity_pub: nil,
   activity_pub_question: 30_000