summaryrefslogtreecommitdiff
path: root/config/gitlab.yml.example
diff options
context:
space:
mode:
Diffstat (limited to 'config/gitlab.yml.example')
-rw-r--r--config/gitlab.yml.example20
1 files changed, 18 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 6758afc91c4..88af8cc12aa 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -185,7 +185,7 @@ production: &base
## Reply by email
# Allow users to comment on issues and merge requests by replying to notification emails.
- # For documentation on how to set this up, see http://doc.gitlab.com/ce/administration/reply_by_email.html
+ # For documentation on how to set this up, see https://docs.gitlab.com/ee/administration/reply_by_email.html
incoming_email:
enabled: false
@@ -230,7 +230,23 @@ production: &base
# client_id: "YOUR-CLIENT-ID"
# client_secret: "YOUR-CLIENT-SECRET"
- # File that contains the shared secret key for verifying access for mailroom's incoming_email.
+ # How mailroom delivers email content to Rails. There are two methods at the moment:
+ # - sidekiq: mailroom pushes the email content to Sidekiq directly. This job
+ # is then picked up by Sidekiq.
+ # - webhook: mailroom triggers a HTTP POST request to Rails web server. The
+ # content is embedded into the request body.
+ # Default is sidekiq.
+ # delivery_method: sidekiq
+
+ # When the delivery method is webhook, those configs tell the url that
+ # mailroom can contact to. Note that the combined url must not end with "/".
+ # At the moment, the webhook delivery method doesn't support HTTP/HTTPs via
+ # UNIX socket.
+ # gitlab_url: "http://gitlab.example"
+
+ # When the delivery method is webhook, this config is the file that
+ # contains the shared secret key for verifying access for mailroom's
+ # incoming_email.
# Default is '.gitlab_mailroom_secret' relative to Rails.root (i.e. root of the GitLab app).
# secret_file: /home/git/gitlab/.gitlab_mailroom_secret