.

software/gitlab/gitlab-tree.txt

+etc/
+    gitlab/
+    gitlab-shell/
+    nginx/
+
+
+srv/
+    backup/
+    repositories/
+    satellites/         ?
+
+    nginx/
+        log     -> var/log/nginx/
+        conf    -> etc/nginx/
+
+
+var/
+    gitlab/
+        tmp/
+        uploads/
+
+
+    log/
+        gitlab-rails/
+        gitlab-shell/
+        gitlab-git-http-server
+        nginx
+        redis
+        sidekiq
+        unicorn
+        ? logrotate
+
+
+    run/
+        *.pid

software/gitlab/instance-gitlab.cfg.in

@@ -18,7 +18,7 @@ parts =
     gitlab-root-shadow
 
 
-    service-nginx-frontend
+    service-nginx
 
 # std stuff for slapos instance
 eggs-directory = {{ eggs_directory }}
@@ -318,7 +318,8 @@ log     = ${directory:log}/nginx
 
 # nginx frontend
 
-[service-nginx-frontend]
+[service-nginx]
 recipe  = slapos.cookbook:wrapper
-wrapper-path    = ${directory:service}/nginx-frontend
-command-line    = {{ nginx }} -p ... -c ${nginx.conf:rendered}
+wrapper-path    = ${directory:service}/nginx
+#command-line    = {{ nginx }} -p ... -c ${nginx.conf:rendered}
+command-line    = {{ nginx }} -p ${directory:home} -c ${nginx.conf:rendered}

software/gitlab/template/nginx.conf.in

@@ -8,8 +8,10 @@
 {# XXX dup -> import from gitlab.yml.in ? #}
 {% macro cfg(name) %}{{ instance_parameter[str("configuration." + name)] }}{% endmacro %}
 
-user {{ gitlab_backend.user }};
-worker_processes {{ cfg('nginx_worker_processes') }}
+# user directive makes sense only when running initially as root (and nginx will complain if not)
+# user {{ gitlab_backend.user }};
+
+worker_processes {{ cfg('nginx_worker_processes') }};
 error_log stderr;
 pid nginx.pid;
 
@@ -37,9 +39,9 @@ http {
   gzip_proxied      {{ cfg('nginx_gzip_proxied') }};
   gzip_types        {{ cfg('nginx_gzip_types') }};
 
-  include {{ mime_types }}
+  include {{ mime_types }};
 
-  {# include {{ nginx_gitlab_http_conf }} #}
+  {# include {{ nginx_gitlab_http_conf }}; #}
 
   # we don't need: ci, mattermost
   # include <%= @gitlab_ci_http_config %>