Merge branch 'chore/format-migrations' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index ddbfb246a32db789d33caecaeab04fc820b896e9..f4d92102f70743f6f8d367eb977d11d0a073c7f8 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -409,7 +409,8 @@ config :pleroma, Pleroma.Web.Metadata,
   providers: [
     Pleroma.Web.Metadata.Providers.OpenGraph,
     Pleroma.Web.Metadata.Providers.TwitterCard,
-    Pleroma.Web.Metadata.Providers.RelMe
+    Pleroma.Web.Metadata.Providers.RelMe,
+    Pleroma.Web.Metadata.Providers.Feed
   ],
   unfurl_nsfw: false
 
@@ -588,7 +589,7 @@ 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