From 7cb4a2aaa4ff78c1b148466aa084b1233b34092c Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Tue, 4 Feb 2014 17:38:49 +0100
Subject: [PATCH] Add domain socket unicorn config

---
 files/gitlab-cookbooks/gitlab/attributes/default.rb  |  9 +++++----
 files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb | 17 +++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index fd8b7b2..b601338 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -42,10 +42,11 @@ default['gitlab']['gitlab-core']['dir'] = "/var/opt/gitlab/gitlab-core"
 default['gitlab']['gitlab-core']['log_directory'] = "/var/log/gitlab/gitlab-core"
 default['gitlab']['gitlab-core']['environment'] = 'production'
 default['gitlab']['gitlab-core']['listen'] = '127.0.0.1'
-default['gitlab']['gitlab-core']['port'] = 9462
-default['gitlab']['gitlab-core']['backlog'] = 1024
-default['gitlab']['gitlab-core']['tcp_nodelay'] = true
-default['gitlab']['gitlab-core']['worker_timeout'] = 3600
+default['gitlab']['gitlab-core']['port'] = 8080
+default['gitlab']['gitlab-core']['unicorn_socket'] = '/var/opt/gitlab/gitlab-core/tmp/sockets/gitlab.socket'
+default['gitlab']['gitlab-core']['tcp_nopush'] = true
+default['gitlab']['gitlab-core']['backlog_socket'] = 64
+default['gitlab']['gitlab-core']['worker_timeout'] = 30
 default['gitlab']['gitlab-core']['umask'] = "0022"
 default['gitlab']['gitlab-core']['worker_processes'] = 2
 default['gitlab']['gitlab-core']['session_key'] = "_sandbox_session"
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
index 1829f93..8e5ed8e 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-core.rb
@@ -51,14 +51,19 @@ link "/opt/gitlab/embedded/service/gitlab-core/.secret" do
   to secret_token_config
 end
 
-unicorn_listen = node['gitlab']['gitlab-core']['listen']
-unicorn_listen << ":#{node['gitlab']['gitlab-core']['port']}"
+unicorn_listen_tcp = node['gitlab']['gitlab-core']['listen']
+unicorn_listen_tcp << ":#{node['gitlab']['gitlab-core']['port']}"
+unicorn_listen_socket = node['gitlab']['gitlab-core']['unicorn_socket']
 
 unicorn_config File.join(gitlab_core_etc_dir, "unicorn.rb") do
-  listen unicorn_listen => {
-    :backlog => node['gitlab']['gitlab-core']['backlog'],
-    :tcp_nodelay => node['gitlab']['gitlab-core']['tcp_nodelay']
-  }
+  listen(
+    unicorn_listen_tcp => {
+      :tcp_nopush => node['gitlab']['gitlab-core']['tcp_nopush']
+    },
+    unicorn_listen_socket => {
+      :backlog => node['gitlab']['gitlab-core']['backlog_socket'],
+    }
+  )
   worker_timeout node['gitlab']['gitlab-core']['worker_timeout']
   working_directory gitlab_core_working_dir
   worker_processes node['gitlab']['gitlab-core']['worker_processes']
--
libgit2 0.21.2