diff --git a/doc/settings/smtp.md b/doc/settings/smtp.md index 7443137f109de1a6e7d960dbae77eb9e17f0854b_ZG9jL3NldHRpbmdzL3NtdHAubWQ=..7b5ce132f604b39c6971c11310e5a0fe3412c488_ZG9jL3NldHRpbmdzL3NtdHAubWQ= 100644 --- a/doc/settings/smtp.md +++ b/doc/settings/smtp.md @@ -117,6 +117,8 @@ ### Amazon Simple Email System (AWS SES) +- Using STARTTLS + ```ruby gitlab_rails['smtp_enable'] = true gitlab_rails['smtp_address'] = "email-smtp.region-1.amazonaws.com" @@ -130,6 +132,22 @@ Make sure to permit egress through port 587 in your ACL and security group. +- Using TLS Wrapper + +```ruby +gitlab_rails['smtp_enable'] = true +gitlab_rails['smtp_address'] = "email-smtp.region-1.amazonaws.com" +gitlab_rails['smtp_port'] = 465 +gitlab_rails['smtp_user_name'] = "IAMmailerKey" +gitlab_rails['smtp_password'] = "IAMmailerSecret" +gitlab_rails['smtp_domain'] = "yourdomain.com" +gitlab_rails['smtp_authentication'] = "login" +gitlab_rails['smtp_ssl'] = true +gitlab_rails['smtp_force_ssl'] = true +``` + +Make sure to permit egress through port 465 in your ACL and security group. + ### Mandrill ```ruby