switch to sendmail by default
This commit is contained in:
parent
d793dafb1f
commit
4841aff2d4
2 changed files with 3 additions and 2 deletions
3
debian/changelog
vendored
3
debian/changelog
vendored
|
@ -1,8 +1,9 @@
|
|||
gitlab (8.4.3+dfsg-8) UNRELEASED; urgency=medium
|
||||
|
||||
* Install tmpfiles.d/gitlab.conf (Closes: #814713)
|
||||
* Switch to sendmail method by default.
|
||||
|
||||
-- Pirate Praveen <praveen@debian.org> Tue, 16 Feb 2016 12:54:54 +0530
|
||||
-- Pirate Praveen <praveen@debian.org> Tue, 16 Feb 2016 12:58:17 +0530
|
||||
|
||||
gitlab (8.4.3+dfsg-7) unstable; urgency=medium
|
||||
|
||||
|
|
2
debian/conf/smtp_settings.rb
vendored
2
debian/conf/smtp_settings.rb
vendored
|
@ -8,7 +8,7 @@
|
|||
# If you change this file in a Merge Request, please also create a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
||||
|
||||
if Rails.env.production?
|
||||
Rails.application.config.action_mailer.delivery_method = :smtp
|
||||
Rails.application.config.action_mailer.delivery_method = :sendmail
|
||||
Rails.application.config.action_mailer.default_options = {from: "#{ENV['GITLAB_EMAIL_FROM']}" || "#{Settings.gitlab['email_from']}" || ''}
|
||||
|
||||
ActionMailer::Base.sendmail_settings = {}
|
||||
|
|
Loading…
Reference in a new issue