Merge branch 'master' into 'master'

Use separate template for smtp_settings.rb  for Gitlab CI

As I mentioned in Issue #345, there is a bug in the generation of Gitlab CI smtp_settings.rb. It uses the same template as for gitlab. This commit introduces a separate template for CI.

See merge request !250

files/gitlab-cookbooks/gitlab/recipes/gitlab-ci.rb

@@ -26,6 +26,7 @@ gitlab_ci_tmp_dir = File.join(gitlab_ci_dir, "tmp")
 gitlab_ci_log_dir = node['gitlab']['gitlab-ci']['log_directory']
 
 gitlab_ci_user = node['gitlab']['gitlab-ci']['username']
+gitlab_app = "gitlab-ci"
 
 group gitlab_ci_user do
   gid node['gitlab']['gitlab-ci']['gid']
@@ -122,7 +123,11 @@ template_symlink File.join(gitlab_ci_etc_dir, "smtp_settings.rb") do
   owner "root"
   group "root"
   mode "0644"
-  variables(node['gitlab']['gitlab-ci'].to_hash)
+  variables(
+    node['gitlab']['gitlab-ci'].to_hash.merge(
+      :app => gitlab_app
+    )
+  )
   restarts dependent_services
 
   unless node['gitlab']['gitlab-ci']['smtp_enable']

files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb

@@ -24,6 +24,7 @@ gitlab_rails_working_dir = File.join(gitlab_rails_dir, "working")
 gitlab_rails_tmp_dir = File.join(gitlab_rails_dir, "tmp")
 gitlab_rails_public_uploads_dir = node['gitlab']['gitlab-rails']['uploads_directory']
 gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory']
+gitlab_app = "gitlab"
 
 # Needed for .gitlab_shell_secret
 gitlab_shell_var_dir = "/var/opt/gitlab/gitlab-shell"
@@ -131,7 +132,11 @@ template_symlink File.join(gitlab_rails_etc_dir, "smtp_settings.rb") do
   owner "root"
   group "root"
   mode "0644"
-  variables(node['gitlab']['gitlab-rails'].to_hash)
+  variables(
+    node['gitlab']['gitlab-rails'].to_hash.merge(
+      :app => gitlab_app
+    )
+  )
   restarts dependent_services
 
   unless node['gitlab']['gitlab-rails']['smtp_enable']

files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb

@@ -2,13 +2,16 @@
 # erased! To change the contents below, edit /etc/gitlab/gitlab.rb
 # and run `sudo gitlab-ctl reconfigure`.
 
+<% rails_app = @app == 'gitlab' ? 'Gitlab' : 'GitlabCi' %>
+<% container = @app == 'gitlab' ? 'gitlab-rails' : 'gitlab-ci' %>
+
 if Rails.env.production?
-  Gitlab::Application.config.action_mailer.delivery_method = :smtp
+  <%= rails_app =>::Application.config.action_mailer.delivery_method = :smtp
 
   ActionMailer::Base.smtp_settings = {
     authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
 <% %w{ address port user_name password domain enable_starttls_auto tls openssl_verify_mode }.each do |key| %>
-  <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
+  <% value = node['gitlab'][container]["smtp_#{key}"] %>
   <% unless value.nil? %>
     <%= "#{key}: #{value.inspect}," %>
   <% end %>