Skip to content

Commit c31dab1

Browse files
axilleasJason Young
andcommitted
Merge branch 'docs-add-proton-mail-smtp' into 'master'
Documentation: Add contributed protonmail settings Closes #8079 See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7042 Merged-by: Achilleas Pipinellis <[email protected]> Approved-by: Achilleas Pipinellis <[email protected]> Reviewed-by: Achilleas Pipinellis <[email protected]> Co-authored-by: Jason Young <[email protected]>
2 parents b01e8ff + b020a8f commit c31dab1

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

doc/settings/smtp.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,23 @@ gitlab_rails['smtp_authentication'] = "plain"
12941294
gitlab_rails['smtp_enable_starttls_auto'] = true
12951295
```
12961296

1297+
### Proton Mail
1298+
1299+
Proton documentation: [How to set up SMTP to use business applications or devices with Proton Mail](https://proton.me/support/smtp-submission)
1300+
1301+
```ruby
1302+
gitlab_rails['smtp_enable'] = true
1303+
gitlab_rails['smtp_address'] = "smtp.protonmail.ch"
1304+
gitlab_rails['smtp_port'] = 587
1305+
gitlab_rails['smtp_authentication'] = "plain"
1306+
gitlab_rails['smtp_enable_starttls_auto'] = true
1307+
gitlab_rails['smtp_user_name'] = "<the Proton email address for which you generated the SMTP token>"
1308+
gitlab_rails['smtp_password'] = "<the generated SMTP token>"
1309+
gitlab_rails['smtp_domain'] = "<your domain>"
1310+
gitlab_rails['gitlab_email_from'] = "<the Proton email address for which you generated the SMTP token>"
1311+
gitlab_rails['gitlab_email_reply_to'] = "<the Proton email address for which you generated the SMTP token>"
1312+
```
1313+
12971314
### More examples are welcome
12981315

12991316
If you have figured out an example configuration yourself please send a Merge

0 commit comments

Comments
 (0)