X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=config%2Fconfig.exs;h=d743406dc898c5b4b02e24197adc26b4e23190a5;hb=d1983ed0282f1ae485f73024f25ec2753901fa8a;hp=980c215c818a12a6109d197ff48f525d28cf06e4;hpb=91724d160acc39585c37742204c59b91e59df569;p=akkoma

diff --git a/config/config.exs b/config/config.exs
index 980c215c8..d743406dc 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -98,7 +98,8 @@ config :pleroma, :instance,
   name: "Pleroma",
   email: "example@example.com",
   description: "A Pleroma instance, an alternative fediverse server",
-  limit: 5000,
+  limit: 5_000,
+  remote_limit: 100_000,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
   background_upload_limit: 4_000_000,
@@ -137,8 +138,8 @@ config :pleroma, :fe,
   logo_mask: true,
   logo_margin: "0.1em",
   background: "/static/aurora_borealis.jpg",
-  redirect_root_no_login: "/~/main/all",
-  redirect_root_login: "/~/main/friends",
+  redirect_root_no_login: "/main/all",
+  redirect_root_login: "/main/friends",
   show_instance_panel: true,
   scope_options_enabled: false,
   formatting_options_enabled: false,
@@ -222,6 +223,8 @@ config :cors_plug,
 
 config :pleroma, Pleroma.User,
   restricted_nicknames: [
+    "about",
+    "~",
     "main",
     "users",
     "settings",
@@ -246,9 +249,18 @@ config :pleroma, Pleroma.User,
     "auth",
     "proxy",
     "dev",
-    "internal"
+    "internal",
+    "media"
   ]
 
+config :pleroma, Pleroma.Web.Federator, max_jobs: 50
+
+config :pleroma, Pleroma.Web.Federator.RetryQueue,
+  enabled: false,
+  max_jobs: 20,
+  initial_timeout: 30,
+  max_retries: 5
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"