diff options
Diffstat (limited to 'doc/administration/incoming_email.md')
| -rw-r--r-- | doc/administration/incoming_email.md | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md index caade32b7c2..63f8ce3c4cb 100644 --- a/doc/administration/incoming_email.md +++ b/doc/administration/incoming_email.md @@ -564,7 +564,7 @@ to receive sub-addressed mail. To enable sub-addressing: -1. Download and install the `ExchangeOnlineManagement` module from the [PowerShell gallery](https://www.powershellgallery.com/packages/ExchangeOnlineManagement/). +1. Download and install the `ExchangeOnlineManagement` module from the [PowerShell gallery](https://www.powershellgallery.com/packages/ExchangeOnlineManagement/2.0.5). 1. In PowerShell, run the following commands: ```powershell @@ -766,6 +766,8 @@ This example for Omnibus GitLab assumes you're using the following mailbox: `inc ##### Configure Microsoft Graph +> Alternative Azure deployments [introduced](https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5978) in GitLab 14.9. + ```ruby gitlab_rails['incoming_email_enabled'] = true @@ -788,4 +790,19 @@ gitlab_rails['incoming_email_inbox_options'] = { } ``` +For Microsoft Cloud for US Government or [other Azure deployments](https://docs.microsoft.com/en-us/graph/deployments), configure the `azure_ad_endpoint` and `graph_endpoint` settings. + +- Example for Microsoft Cloud for US Government: + +```ruby +gitlab_rails['incoming_email_inbox_options'] = { + 'azure_ad_endpoint': 'https://login.microsoftonline.us', + 'graph_endpoint': 'https://graph.microsoft.us', + 'tenant_id': '<YOUR-TENANT-ID>', + 'client_id': '<YOUR-CLIENT-ID>', + 'client_secret': '<YOUR-CLIENT-SECRET>', + 'poll_interval': 60 # Optional +} +``` + The Microsoft Graph API is not yet supported in source installations. See [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/326169) for more details. |