Merge branch 'remote-ip' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 1988753d669f031f5bb1b600b1fd19a40cb8ec69..36bea19a089a51d035c696d2446ba8cf24e426df 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,
@@ -591,6 +591,8 @@ config :pleroma, :rate_limit, nil
 
 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