X Took decision to glue everything together via unix sockets in 1 partition

software/gitlab/instance-gitlab.cfg.in

@@ -17,6 +17,9 @@ parts =
 
     gitlab-root-shadow
 
+
+    service-nginx-frontend
+
 # std stuff for slapos instance
 eggs-directory = {{ eggs_directory }}
 develop-eggs-directory = {{ develop_eggs_directory }}
@@ -177,6 +180,21 @@ template = {{ rack_attack_rb_in }}
 context =
     section instance_parameter  instance-parameter
 
+# XXX move to own directory?
+[nginx.conf]
+<= gitlab-etc-template
+template= {{ nginx_conf_in }}
+context =
+    section instance_parameter      instance-parameter
+    section gitlab_backend          gitlab-backend
+    raw     mime_types              {{ mime_types }}
+
+#   raw     nginx_gitlab_http_conf  ${nginx-gitlab-http.conf:rendered}
+
+[nginx-gitlab-http.conf]
+<= gitlab-etc-template
+template= {{ nginx_gitlab_http_conf_in }}
+context = ...
 
 # TODO log: logrotate
 
@@ -292,7 +310,15 @@ command =
 
 
 # nginx: etc/ log/ ...
-[nginx]
+[xnginx]
 recipe  = slapos.cookbook:mkdirectory
 log     = ${directory:log}/nginx
 # TODO more?
+
+
+# nginx frontend
+
+[service-nginx-frontend]
+recipe  = slapos.cookbook:wrapper
+wrapper-path    = ${directory:service}/nginx-frontend
+command-line    = {{ nginx }} -p ... -c ${nginx.conf:rendered}

software/gitlab/instance.cfg.in

@@ -31,6 +31,8 @@ context =
     raw gitlab_repository_location  ${gitlab-repository:location}
     raw bundler_4gitlab             ${bundler-4gitlab:bundle}
     raw git                         ${git:location}/bin/git
+    raw nginx                       ${nginx-output:nginx}
+    raw mime_types                  ${nginx-output:mime}
 
     raw gitlab_parameters_cfg       ${gitlab-parameters.cfg:target}
     raw database_yml_in             ${database.yml.in:target}
@@ -39,5 +41,8 @@ context =
     raw smtp_settings_rb_in         ${smtp_settings.rb.in:target}
     raw rack_attack_rb_in           ${rack_attack.rb.in:target}
 
+    raw nginx_conf_in               ${nginx.conf.in:target}
+    raw nginx_gitlab_http_conf_in   ${nginx-gitlab-http.conf.in:target}
+
 # XXX hack - better use ${gitlab-shell-repository:location} directly
     raw gitlab_shell                ${gitlab-shell-repository:location}

software/gitlab/template/nginx.conf.in

@@ -32,14 +32,14 @@ http {
   keepalive_timeout {{ cfg('nginx_keepalive_timeout') }};
 
   gzip              {{ cfg('nginx_gzip') }};
-  gzip_http_version {{ cfg('nginx_http_version') }};
+  gzip_http_version {{ cfg('nginx_gzip_http_version') }};
   gzip_comp_level   {{ cfg('nginx_gzip_comp_level') }};
   gzip_proxied      {{ cfg('nginx_gzip_proxied') }};
   gzip_types        {{ cfg('nginx_gzip_types') }};
 
-  include {{ nginx_output.mime }}
+  include {{ mime_types }}
 
-  include <gitlab_http_config>
+  {# include {{ nginx_gitlab_http_conf }} #}
 
   # we don't need: ci, mattermost
   # include <%= @gitlab_ci_http_config %>