realaravinth/debian-mirror-gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch to sendmail by default

Browse source
This commit is contained in:
Praveen Arimbrathodiyil 2016-02-16 12:58:43 +05:30
parent d793dafb1f
commit 4841aff2d4
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
debian/changelog vendored
View file

@ -1,8 +1,9 @@
gitlab (8.4.3+dfsg-8) UNRELEASED; urgency=medium gitlab (8.4.3+dfsg-8) UNRELEASED; urgency=medium
* Install tmpfiles.d/gitlab.conf (Closes: #814713) * 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 gitlab (8.4.3+dfsg-7) unstable; urgency=medium

2
debian/conf/smtp_settings.rb vendored
View file

@ -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 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? 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']}" || ''} Rails.application.config.action_mailer.default_options = {from: "#{ENV['GITLAB_EMAIL_FROM']}" || "#{Settings.gitlab['email_from']}" || ''}
ActionMailer::Base.sendmail_settings = {} ActionMailer::Base.sendmail_settings = {}