X Draft unicorn.rb stub

software/gitlab/instance-gitlab.cfg.in

@@ -79,6 +79,14 @@ configuration.backup_keep_time          = 0
 configuration.git_max_size              =
 configuration.git_timeout               =
 
+# unicorn
+configuration.unicorn_worker_timeout    = 60
+configuration.unicorn_worker_processes  = {{ multiprocessing.cpu_count() + 1 }}
+
+
+# unicorn advanced
+configuration.unicorn_tcp_nopush        = true
+
 # nginx
 configuration.nginx_proxy_read_timeout  = 300
 configuration.nginx_proxy_connect_timeout  = 300
@@ -257,8 +265,9 @@ command-line =
 # <= gitlab-bin
 
 
-# Gitlab/Rails operation is tighted that config/ lives inside code.
-# to have ability to create several instances configured differently from 1 SR.
+# Gitlab/Rails operation is tighted that config/ lives inside code, which goes
+# against having ability to create several instances configured differently
+# from 1 SR.
 #
 # One possibility to overcome this could be to make another Gitlab root
 # symbolically linked to original SR _and_ several configuration files

software/gitlab/instance.cfg.in

@@ -38,4 +38,3 @@ context =
 recipe = slapos.cookbook:softwaretype
 default = $${instance-gitlab.cfg:rendered}
 #single-default = $${dynamic-template-powerdns:rendered}
-

software/gitlab/template/unicorn.rb.in

+# @autogenerated XXX
+# see:
+# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example
+# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/unicorn.rb.example.development
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
+# (last updated for omnibus-gitlab 8.1.0+rc1.ce.0-24-g3021ed9 XXX check)
+
+# What ports/sockets to listen on, and what options for them.
+listen "{XXX:unicorn-host:port}", :tcp_nopush => ${instance-parameters:configuration.unicorn_tcp_nopush}
+
+# TODO
+<%- if @working_directory %>
+working_directory '<%= @working_directory %>'
+<%- end %>
+
+# What the timeout for killing busy workers is, in seconds
+timeout         ${instance-parameters:configuration.unicorn_worker_timeout}
+
+# Whether the app should be pre-loaded
+preload_app     true
+
+# How many worker processes
+worker_processes    ${instance-parameters:configuration.unicorn_worker_processes}
+
+# TODO (see definitions/unicorn_service.rb)
+# <%- if @before_fork %>
+# # What to do before we fork a worker
+# before_fork do |server, worker|
+#   <%= @before_fork %>
+# end
+# 
+# <%- end %>
+# <%- if @after_fork %>
+# # What to do after we fork a worker
+# after_fork do |server, worker|
+#   <%= @after_fork %>
+# end
+# 
+# <%- end %>
+
+# Where to drop a pidfile
+pid ${XXXunicorn:var}/unicorn.pid
+
+# Where stderr gets logged
+stderr_path ${XXXunicorn:log}/unicorn_stderr.log
+
+# Where stdout gets logged
+stdout_path ${XXXunicorn:log}/unicorn_stdout.log