summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSytse Sijbrandij <sytse@gitlab.com>2014-12-08 13:30:20 +0000
committerSytse Sijbrandij <sytse@gitlab.com>2014-12-08 13:30:20 +0000
commitacf1844897405849f836fefc96284dd7a8416879 (patch)
treee3989096277d0dd488338ac3c3c26bafe8418958 /config
parent7d662114b301ff507767778ad509ebf552b2b8e2 (diff)
parentf811b695f8c9d7019b5e9f33aae962163e8c0020 (diff)
downloadgitlab-ce-acf1844897405849f836fefc96284dd7a8416879.tar.gz
Merge branch 'unicorn-advice' into 'master'
Unicorn advice See merge request !1314
Diffstat (limited to 'config')
-rw-r--r--config/unicorn.rb.example14
1 files changed, 7 insertions, 7 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index ea22744fd90..d8b4f5c7c32 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -13,9 +13,9 @@
#
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
-# Use at least one worker per core if you're on a dedicated server,
-# more will usually help for _short_ waits on databases/caches.
-# The minimum is 2
+# Read about unicorn workers here:
+# http://doc.gitlab.com/ee/install/requirements.html#unicorn-workers
+#
worker_processes 2
# Since Unicorn is never exposed to outside clients, it does not need to
@@ -37,10 +37,10 @@ listen "127.0.0.1:8080", :tcp_nopush => true
# nuke workers after 30 seconds instead of 60 seconds (the default)
#
-# NOTICE: git push over http depends on this value.
-# If you want be able to push huge amount of data to git repository over http
-# you will have to increase this value too.
-#
+# NOTICE: git push over http depends on this value.
+# If you want be able to push huge amount of data to git repository over http
+# you will have to increase this value too.
+#
# Example of output if you try to push 1GB repo to GitLab over http.
# -> git push http://gitlab.... master
#