X Connect nginx to unicorn

software/gitlab/instance-gitlab.cfg.in

@@ -196,6 +196,7 @@ context-extra =
     section gitlab_backend          gitlab-backend
     section nginx                   nginx
     section gitlab_root_shadow      gitlab-root-shadow
+    section unicorn                 unicorn
 
 # TODO log: logrotate
 
@@ -378,11 +379,16 @@ command-line    = {{ gitlab_workhorse }}
 ######################
 #   unicorn worker   #
 ######################
-[unicorn]
+[unicorn-dir]
 recipe  = slapos.cookbook:mkdirectory
 srv     = ${directory:srv}/unicorn
 log     = ${directory:log}/unicorn
 
+[unicorn]
+srv     = ${unicorn-dir:srv}
+log     = ${unicorn-dir:log}
+socket  = ${:srv}/unicorn.socket
+
 [service-unicorn]
 recipe  = slapos.cookbook:wrapper
 wrapper-path    = ${directory:service}/unicorn

software/gitlab/template/nginx-gitlab-http.conf.in

@@ -5,11 +5,8 @@
 
 {% from 'macrolib.cfg.in' import cfg, cfg_bool  with context %}
 
-# TODO unix socket of unicorn
 upstream gitlab {
-  {# TODO reenable #}
-  {# server unix:<%= @socket %> fail_timeout=0; #}
-  server unix:/dev/null fail_timeout=0;
+  server unix:{{ unicorn.socket }} fail_timeout=0;
 }
 
 # TODO unix socket of gitlab-git-http-server

software/gitlab/template/unicorn.rb.in

@@ -9,7 +9,7 @@
 
 # What ports/sockets to listen on, and what options for them.
 # we listen only on unix socket
-listen "{{ unicorn.srv }}/unicorn.socket", :backlog => {{ cfg('unicorn_backlog_socket') }}
+listen "{{ unicorn.socket }}", :backlog => {{ cfg('unicorn_backlog_socket') }}
 
 working_directory '{{ gitlab_root_shadow.location }}'