summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-03-29 13:43:07 +0000
committerlambda <lain@soykaf.club>2019-03-29 13:43:07 +0000
commitdc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (patch)
tree0d48ac42b45e72951ef1f5548fdd132d8cb031b1
parenta5edc4da6225ff2bf1ea8862b1c857d7e87c920f (diff)
parentafbc905a1caf62705a7c5332d7fd847509701e54 (diff)
downloadpleroma-dc39d8d3fb941bad9fe26586c321bb00a0b92fe4.tar.gz
pleroma-dc39d8d3fb941bad9fe26586c321bb00a0b92fe4.zip
Merge branch 'fix/job-queue-doc' into 'develop'
Improve PleromaJobQeue config documentation See merge request pleroma/pleroma!993
-rw-r--r--docs/config.md7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/config.md b/docs/config.md
index c206358ab..3624e295b 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -255,7 +255,12 @@ curl "http://localhost:4000/api/pleroma/admin/invite_token?admin_token=somerando
## :pleroma_job_queue
-[Pleroma Job Queue][https://git.pleroma.social/pleroma/pleroma_job_queue] configuration: a list of queues with maximum concurrent jobs.
+[Pleroma Job Queue](https://git.pleroma.social/pleroma/pleroma_job_queue) configuration: a list of queues with maximum concurrent jobs.
+
+Pleroma has the following queues:
+* `federator_outgoing` - Outgoing federation
+* `federator_incoming` - Incoming federation
+* `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer)
Example: