diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-08 09:50:10 +0300 |
commit | 6ace422c298eef2c592d64c08f59b3da3d8d8a6d (patch) | |
tree | 9a1a43baeab7e73a4a97c9d4be18a2ddbe4f257c /config/puma.rb.example | |
parent | 2882d16e7a244d6627d9f6d9436651a38bf11bad (diff) | |
parent | 6f5f5e7ee32bbd693796571fa6fcb8575accc08a (diff) | |
download | gitlab-ce-6ace422c298eef2c592d64c08f59b3da3d8d8a6d.tar.gz |
Merge branch 'master' into 6-0-dev
Conflicts:
Gemfile
Gemfile.lock
Diffstat (limited to 'config/puma.rb.example')
-rw-r--r-- | config/puma.rb.example | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/puma.rb.example b/config/puma.rb.example index 025ff7f3f05..c363ad010b6 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -61,6 +61,13 @@ bind "unix://#{application_path}/tmp/sockets/gitlab.socket" # # workers 2 +# GitLab cluster mode recommendations +# If you have more than 1 GB RAM, uncomment one of the following lines: +# +# workers 2 # if you have at least 1.5 GB RAM +# workers 3 # if you have at least 2 GB RAM +# workers 4 # if you have at least 2.5 GB RAM + # Code to run when a worker boots to setup the process before booting # the app. # |