Add smtp configuration
This commit is contained in:
parent
a5ec27954a
commit
2286e3c817
2 changed files with 16 additions and 0 deletions
15
debian/conf/smtp_settings.rb
vendored
Normal file
15
debian/conf/smtp_settings.rb
vendored
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
# To enable smtp email delivery for your GitLab instance do the following:
|
||||||
|
# 1. Rename this file to smtp_settings.rb
|
||||||
|
# 2. Edit settings inside this file
|
||||||
|
# 3. Restart GitLab instance
|
||||||
|
#
|
||||||
|
# For full list of options and their values see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||||
|
#
|
||||||
|
# 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.default_options = {from: "#{ENV['GITLAB_EMAIL_FROM']}" || "#{Settings.gitlab['email_from']}" || ''}
|
||||||
|
|
||||||
|
ActionMailer::Base.sendmail_settings = {}
|
||||||
|
end
|
1
debian/install
vendored
1
debian/install
vendored
|
@ -6,6 +6,7 @@ debian/conf/resque.yml etc/gitlab
|
||||||
debian/conf/gitlab-debian.conf etc/gitlab
|
debian/conf/gitlab-debian.conf etc/gitlab
|
||||||
debian/conf/*.target lib/systemd/system
|
debian/conf/*.target lib/systemd/system
|
||||||
debian/conf/*.service lib/systemd/system
|
debian/conf/*.service lib/systemd/system
|
||||||
|
debian/conf/smtp_settings.rb usr/share/gitlab/config/initializers/
|
||||||
debian/adduser.sh usr/lib/gitlab/scripts
|
debian/adduser.sh usr/lib/gitlab/scripts
|
||||||
debian/grantpriv.sh usr/lib/gitlab/scripts
|
debian/grantpriv.sh usr/lib/gitlab/scripts
|
||||||
debian/rake-tasks.sh usr/lib/gitlab/scripts
|
debian/rake-tasks.sh usr/lib/gitlab/scripts
|
||||||
|
|
Loading…
Add table
Reference in a new issue