X Stub unicorn service

software/gitlab/instance-gitlab.cfg.in

@@ -10,7 +10,7 @@ parts =
     publish-instance-info
 
 #   gitlab-<prog>
-# ? unicorn_rails, mailroom, ri
+# ? mailroom, ri
 {% set gitlab_progv = 'rails rake unicorn sidekiq' .split() %}
 {% for prog in gitlab_progv %}
     gitlab-{{ prog }}
@@ -19,8 +19,8 @@ parts =
     gitlab-root-shadow
 
     service-gitlab-workhorse
-#   service-gitlab-unicorn
-#   service-gitlab-sidekiq
+    service-unicorn
+#   service-sidekiq
 
     service-nginx
     service-postgresql
@@ -171,6 +171,11 @@ template = {{ rack_attack_rb_in }}
 context-extra =
     section instance_parameter  instance-parameter
 
+[unicorn.rb]
+<= gitlab-etc-template
+template = {{ unicorn_rb_in }}
+context-extra =
+    section instance_parameter  instance-parameter
 
 [nginx-etc-template]
 <= etc-template
@@ -261,7 +266,7 @@ command =
     ln -s ${gitlab:tmp} tmp             &&
 # config/
     cd config   &&
-    ln -s ${gitlab:etc}/unicorn.rb .    &&
+    ln -s ${unicorn.rb:rendered} unicorn.rb &&
     ln -s ${gitlab.yml:rendered} gitlab.yml &&
     ln -s ${database.yml:rendered} database.yml &&
     ln -s ${resque.yml:rendered} resque.yml &&
@@ -373,6 +378,17 @@ command-line    = {{ gitlab_workhorse }}
     -listenAddr ${gitlab-workhorse:srv}/gitlab-workhorse.socket
 
 
+######################
+#   unicorn worker   #
+######################
+[service-unicorn]
+recipe  = slapos.cookbook:wrapper
+wrapper-path    = ${directory:service}/unicorn
+command-line    = ${gitlab-unicorn:wrapper-path}
+    -E production
+    -c ${unicorn.rb:rendered}
+    ${gitlab-root-shadow:location}/config.ru
+
 
 ######################
 #   Nginx frontend   #

software/gitlab/instance.cfg.in

@@ -45,6 +45,7 @@ context =
     raw resque_yml_in               ${resque.yml.in:target}
     raw smtp_settings_rb_in         ${smtp_settings.rb.in:target}
     raw rack_attack_rb_in           ${rack_attack.rb.in:target}
+    raw unicorn_rb_in               ${unicorn.rb.in:target}
 
     raw nginx_conf_in               ${nginx.conf.in:target}
     raw nginx_gitlab_http_conf_in   ${nginx-gitlab-http.conf.in:target}