summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:40:03 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:40:03 +0400
commit76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f (patch)
treeffc5e72a54b1fe1289038e934fb20eb6c1431b4f /config/config.exs
parent2b58b0dbce36042a8acbb41a8ddc8696d2e00d0e (diff)
parent0495a07dc77d81abf46cbe166ae3fec14f705809 (diff)
downloadpleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.tar.gz
pleroma-76c4e80e5a1b59efeeaf7797d9c08081b7a66c5f.zip
Merge branch 'develop' into mutes-blocks-pagination
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 273da5bb6..2c6142360 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -802,6 +802,8 @@ config :pleroma, :hackney_pools,
timeout: 300_000
]
+config :pleroma, :majic_pool, size: 2
+
private_instance? = :if_instance_is_private
config :pleroma, :restrict_unauthenticated,