Merge branch 'puma_cluster_recommendation' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 7588186e ae9e4a52
Showing 1 changed file with 7 additions and 0 deletions Show diff stats
config/puma.rb.example
@@ -93,6 +93,13 @@ bind &quot;unix://#{application_path}/tmp/sockets/gitlab.socket&quot;
 #
 # 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.
 #
...	...	@@ -93,6 +93,13 @@ bind "unix://#{application_path}/tmp/sockets/gitlab.socket"
93	93	#
94	94	# workers 2
95	95
	96	+# GitLab cluster mode recommendations
	97	+# If you have more than 1 GB RAM, uncomment one of the following lines:
	98	+#
	99	+# workers 2 # if you have at least 1.5 GB RAM
	100	+# workers 3 # if you have at least 2 GB RAM
	101	+# workers 4 # if you have at least 2.5 GB RAM
	102	+
96	103	# Code to run when a worker boots to setup the process before booting
97	104	# the app.
98	105	#
...	...