From: rinpatch <rinpatch@sdf.org>
Date: Wed, 2 Jan 2019 16:23:46 +0000 (+0000)
Subject: Merge branch 'fix/reserve-media-username' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d1983ed0282f1ae485f73024f25ec2753901fa8a;p=akkoma

Merge branch 'fix/reserve-media-username' into 'develop'

Reserve /media

See merge request pleroma/pleroma!620
---

d1983ed0282f1ae485f73024f25ec2753901fa8a
diff --cc config/config.exs
index d30b33197,47ed8d260..d743406dc
--- a/config/config.exs
+++ b/config/config.exs
@@@ -249,17 -249,10 +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"