Merge tag '13.12.1' into merge-upstream

This commit is contained in:
riku6460 2023-05-09 17:45:24 +09:00
commit 0b29445222
No known key found for this signature in database
GPG key ID: 27414FA27DB94CF6
388 changed files with 12041 additions and 6800 deletions

View file

@ -95,15 +95,14 @@ redis:
# #prefix: example-prefix
# #db: 1
# ┌─────────────────────────────
#───┘ Elasticsearch configuration └─────────────────────────────
# ┌───────────────────────────
#───┘ MeiliSearch configuration └─────────────────────────────
#elasticsearch:
#meilisearch:
# host: localhost
# port: 9200
# ssl: false
# user:
# pass:
# port: 7700
# apiKey: ''
# ssl: true
# ┌───────────────┐
#───┘ ID generation └───────────────────────────────────────────
@ -133,16 +132,20 @@ id: 'aid'
#clusterLimit: 1
# Job concurrency per worker
# deliverJobConcurrency: 128
# inboxJobConcurrency: 16
#deliverJobConcurrency: 128
#inboxJobConcurrency: 16
#relashionshipJobConcurrency: 16
# What's relashionshipJob?:
# Follow, unfollow, block and unblock(ings) while following-imports, etc. or account migrations.
# Job rate limiter
# deliverJobPerSec: 128
# inboxJobPerSec: 16
#deliverJobPerSec: 128
#inboxJobPerSec: 16
#relashionshipJobPerSec: 64
# Job attempts
# deliverJobMaxAttempts: 12
# inboxJobMaxAttempts: 8
#deliverJobMaxAttempts: 12
#inboxJobMaxAttempts: 8
# IP address family used for outgoing request (ipv4, ipv6 or dual)
#outgoingAddressFamily: ipv4