diff options
Diffstat (limited to 'config/initializers/smtp_settings.rb.sample')
| -rw-r--r-- | config/initializers/smtp_settings.rb.sample | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample index 4a50c29143d..eefc2253122 100644 --- a/config/initializers/smtp_settings.rb.sample +++ b/config/initializers/smtp_settings.rb.sample @@ -9,6 +9,7 @@ if Rails.env.production? Rails.application.config.action_mailer.delivery_method = :smtp + secrets = Gitlab::Email::SmtpConfig.secrets ActionMailer::Base.delivery_method = :smtp ActionMailer::Base.smtp_settings = { @@ -16,6 +17,10 @@ if Rails.env.production? port: 465, user_name: "smtp", password: "123456", + ## If you are using encrypted smtp credentials then you should instead use the secrets user_name/password + ## See: https://docs.gitlab.com/ee/administration/raketasks/smtp.html#secrets + # user_name: secrets.username, + # password: secrets.password, domain: "gitlab.company.com", authentication: :login, enable_starttls_auto: true, @@ -31,6 +36,7 @@ end # # if Rails.env.production? # Rails.application.config.action_mailer.delivery_method = :smtp_pool +# secrets = Gitlab::Email::SmtpConfig.secrets # # ActionMailer::Base.delivery_method = :smtp_pool # ActionMailer::Base.smtp_pool_settings = { @@ -40,6 +46,10 @@ end # port: 465, # user_name: "smtp", # password: "123456", +# ## If you are using encrypted smtp credentials then you should instead use the secrets user_name/password +# ## See: https://docs.gitlab.com/ee/administration/raketasks/smtp.html#secrets +# # user_name: secrets.username, +# # password: secrets.password, # domain: "gitlab.company.com", # authentication: :login, # enable_starttls_auto: true, |