Commit 41285154 authored by Marin Jankovski's avatar Marin Jankovski

Correct placement.

parent a6ee8918
......@@ -88,25 +88,6 @@ ruby_block "Copy from example rack attack config" do
end
end
# SMTP email settings
if gitlab['smtp']['enabled']
smtp = gitlab['smtp']
template File.join(gitlab['path'], 'config', 'initializers', 'smtp_settings.rb') do
source "smtp_settings.rb.erb"
user gitlab['user']
group gitlab['group']
variables({
:address => smtp['address'],
:port => smtp['port'],
:username => smtp['username'],
:password => smtp['password'],
:domain => smtp['domain'],
:authentication => smtp['authentication'],
:enable_starttls_auto => smtp['enable_starttls_auto']
})
end
end
### Configure Git global settings for git user, useful when editing via web
bash "git config" do
code <<-EOS
......@@ -250,6 +231,25 @@ when 'production'
end
end
# SMTP email settings
if gitlab['smtp']['enabled']
smtp = gitlab['smtp']
template File.join(gitlab['path'], 'config', 'initializers', 'smtp_settings.rb') do
source "smtp_settings.rb.erb"
user gitlab['user']
group gitlab['group']
variables({
:address => smtp['address'],
:port => smtp['port'],
:username => smtp['username'],
:password => smtp['password'],
:domain => smtp['domain'],
:authentication => smtp['authentication'],
:enable_starttls_auto => smtp['enable_starttls_auto']
})
end
end
if gitlab['aws']['enabled']
template "aws.yml" do
owner gitlab['user']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment