X root-shadow -> work

software/gitlab/instance-gitlab.cfg.in

@@ -19,8 +19,8 @@ parts =
 
 # TODO gitlab-shell - since compiled shell picks up /usr/bin/env ruby ... ?
 
-    gitlab-root-shadow
-    gitlab-shell-root-shadow
+    gitlab-work
+    gitlab-shell-work
 
     service-gitlab-workhorse
     service-unicorn
@@ -172,9 +172,9 @@ context-extra =
 <= gitlab-etc-template
 template= {{ gitlab_yml_in }}
 context-extra =
-    section gitlab                      gitlab
-    section gitlab_shell                gitlab-shell
-    section gitlab_shell_root_shadow    gitlab-shell-root-shadow
+    section gitlab                  gitlab
+    section gitlab_shell            gitlab-shell
+    section gitlab_shell_work       gitlab-shell-work
     import  urlparse  urlparse
 
 [resque.yml]
@@ -197,7 +197,7 @@ template = {{ unicorn_rb_in }}
 context-extra =
     section unicorn                 unicorn
     section directory               directory
-    section gitlab_root_shadow      gitlab-root-shadow
+    section gitlab_work             gitlab-work
 
 
 [gitlab-shell-config.yml]
@@ -229,7 +229,7 @@ context-extra =
 template= {{ nginx_gitlab_http_conf_in }}
 context-extra =
     section nginx                   nginx
-    section gitlab_root_shadow      gitlab-root-shadow
+    section gitlab_work             gitlab-work
     section gitlab_workhorse        gitlab-workhorse
     section unicorn                 unicorn
 
@@ -253,7 +253,7 @@ environment  =
 # NOTE sys.argv[1:] implicityly appended
 command-line =
     {{ bundler_4gitlab }} exec sh -c
-    'cd ${gitlab-root-shadow:location} && ${:prog} "$@"' ${:prog}
+    'cd ${gitlab-work:location} && ${:prog} "$@"' ${:prog}
 
 {% for prog in gitlab_progv %}
 [gitlab-{{ prog }}]
@@ -282,11 +282,9 @@ prog    = {{ prog }}
 # This way Gitlab/Rails still think they work in 1 code / 1 instance way,
 # and we can reuse SR.
 # XXX run second time after first error try? (mkdir fails)
-# XXX naming
 # XXX better do such tricks with bind mounting, but that requires user namespaces
 
-# TODO root-shadow -> work
-[root-shadow]
+[work-base]
 recipe  = plone.recipe.command
 stop-on-error = yes
 location = ${directory:home}/${:_buildout_section_name_}
@@ -306,8 +304,8 @@ update-command =
 
 # NOTE there is no need to link/create .gitlab_shell_secret - we set path to it
 # in gitlab & gitlab-shell configs, and gitlab creates it on its first start
-[gitlab-root-shadow]
-<= root-shadow
+[gitlab-work]
+<= work-base
 software = {{ gitlab_repository_location }}
 tune-command =
 # secret* tmp/ log/
@@ -335,8 +333,8 @@ tune-command =
 
 
 # ----//---- for gitlab-shell
-[gitlab-shell-root-shadow]
-<= root-shadow
+[gitlab-shell-work]
+<= work-base
 software = {{ gitlab_shell_repository_location }}
 
 tune-command =
@@ -464,7 +462,7 @@ wrapper-path    = ${directory:service}/unicorn
 command-line    = ${gitlab-unicorn:wrapper-path}
     -E production
     -c ${unicorn.rb:rendered}
-    ${gitlab-root-shadow:location}/config.ru
+    ${gitlab-work:location}/config.ru
 
 
 #######################################
@@ -491,7 +489,7 @@ wrapper-path    = ${directory:service}/sidekiq
 # XXX -C ?
 command-line    = ${gitlab-sidekiq:wrapper-path}
     -e production
-    -r ${gitlab-root-shadow:location}
+    -r ${gitlab-work:location}
     -t ${instance-parameter:configuration.sidekiq_shutdown_timeout}
     -L ${sidekiq:log}/sidekiq.log
 

software/gitlab/template/gitlab.yml.in

@@ -104,10 +104,10 @@ production: &base
 
   ## GitLab Shell settings
   gitlab_shell:
-    path:   {{ gitlab_shell_root_shadow.location }}
+    path:   {{ gitlab_shell_work.location }}
 
     repos_path: {{ gitlab.repositories }}
-    hooks_path: {{ gitlab_shell_root_shadow.location }}/hooks/
+    hooks_path: {{ gitlab_shell_work.location }}/hooks/
     secret_file: {{ gitlab_shell.secret }}
 
     # Git over HTTP is enabled

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

@@ -39,7 +39,7 @@ server {
   # XXX fqdn
   server_name <%= @fqdn %>;
   server_tokens off; ## Don't show the nginx version number, a security best practice
-  root {{ gitlab_root_shadow.location }}/public;
+  root {{ gitlab_work.location }}/public;
 
   ## Increase this if you want to upload large attachments
   ## Or if you want to accept large git objects over http
@@ -177,7 +177,7 @@ server {
   ## See config/application.rb under "Relative url support" for the list of
   ## other files that need to be changed for relative url support
   location ~ ^/(assets)/ {
-    root {{ gitlab_root_shadow.location }}/public;
+    root {{ gitlab_work.location }}/public;
     {# TODO reenable after --with-http_gzip_static_module added to nginx
     gzip_static on; # to serve pre-gzipped version
     #}

software/gitlab/template/unicorn.rb.in

@@ -12,7 +12,7 @@
 listen "{{ unicorn.socket }}", :backlog => {{ cfg('unicorn_backlog_socket') }}
 #listen "127.0.0.1:8888", :tcp_nopush => true
 
-working_directory '{{ gitlab_root_shadow.location }}'
+working_directory '{{ gitlab_work.location }}'
 
 # What the timeout for killing busy workers is, in seconds
 timeout         {{ cfg('unicorn_worker_timeout') }}