Merge branch 'fix-mailroom' into 'master'

Render omnibus-specific mailroom.yml

And turn off mailroom quiet mode.

See merge request !518

files/gitlab-cookbooks/gitlab/definitions/mailroom_service.rb

@@ -23,6 +23,10 @@ define :mailroom_service, :rails_app => nil, :user => nil do
   mailroom_log_dir = node['gitlab']['gitlab-rails']['incoming_email_log_directory']
   mail_room_config = File.join(node['gitlab']['gitlab-rails']['dir'], "etc", "mail_room.yml")
 
+  cookbook_file mail_room_config do
+    notifies :restart, 'service[mailroom]'
+  end
+
   directory mailroom_log_dir do
     owner user
     mode '0700'

files/gitlab-cookbooks/gitlab/files/default/mail_room.yml

@@ -0,0 +1,39 @@
+:mailboxes:
+<%
+require '/opt/gitlab/embedded/service/gitlab-rails/config/environment.rb'
+
+if Gitlab::IncomingEmail.enabled? 
+  config = Gitlab::IncomingEmail.config
+
+  redis_config_file = "/opt/gitlab/embedded/service/gitlab-rails/config/resque.yml"
+  redis_url = 
+    if File.exists?(redis_config_file)
+      YAML.load_file(redis_config_file)[Rails.env]
+    else
+      "redis://localhost:6379"
+    end
+  %>
+  -
+    :host: <%= config.host.to_json %>
+    :port: <%= config.port.to_json %>
+    :ssl: <%= config.ssl.to_json %>
+    :start_tls: <%= config.start_tls.to_json %>
+    :email: <%= config.user.to_json %>
+    :password: <%= config.password.to_json %>
+
+    :name: <%= config.mailbox.to_json %>
+
+    :delete_after_delivery: true
+
+    :delivery_method: sidekiq
+    :delivery_options:
+      :redis_url: <%= redis_url.to_json %>
+      :namespace: resque:gitlab
+      :queue: incoming_email
+      :worker: EmailReceiverWorker
+
+    :arbitration_method: redis
+    :arbitration_options:
+      :redis_url: <%= redis_url.to_json %>
+      :namespace: mail_room:gitlab
+<% end %>

files/gitlab-cookbooks/gitlab/templates/default/sv-mailroom-run.erb

@@ -10,4 +10,4 @@ echo 'Runit: starting mail_room'
 exec chpst -e /opt/gitlab/etc/<%= @options[:rails_app] %>/env -P \
   -U <%= @options[:user] %> -u <%= @options[:user] %> \
   /opt/gitlab/embedded/bin/bundle exec mail_room \
-    -q -c <%= @options[:mail_room_config] %>
+    -c <%= @options[:mail_room_config] %>