Commit 388eaa2d authored by Kirill Smelkov's avatar Kirill Smelkov

gitlab: Add xz-utils on path

For reasons similar to in 788e9e94 (gitlab: Fix 500 when downloading
archive.tar.gz and archive.tar.bz2) only now to support archive.tar.xz
parent 67304f65
......@@ -534,7 +534,7 @@ command-line = {{ gitlab_workhorse }}
# - ruby to be available on path (gitlab-workhorse -> gitlab-shell -> hooks on push)
# - gitconfig be found from ~/.gitconfig
environment =
PATH={{ git_location }}/bin:{{ ruby_location }}/bin:{{ gzip_location }}/bin:{{ bzip2_location}}/bin
PATH={{ git_location }}/bin:{{ ruby_location }}/bin:{{ gzip_location }}/bin:{{ bzip2_location}}/bin:{{ xz_location }}/bin
HOME=${directory:home}
depend =
......
......@@ -49,6 +49,7 @@ context =
raw redis_binprefix ${redis28:location}/bin
raw ruby_location ${bundler-4gitlab:ruby-location}
raw watcher_sigkill ${watcher-sigkill:rendered}
raw xz_location ${xz-utils:location}
# config files
raw config_ru_in ${config.ru.in:target}
......
......@@ -20,6 +20,7 @@ extends =
../../component/gzip/buildout.cfg
../../component/dcron/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/xz-utils/buildout.cfg
parts =
ruby2.1
......@@ -193,7 +194,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = e5e7ddede71265987bb0c534b009aa45
md5sum = 1f8b3321e507efd2333952be22caac93
[watcher-sigkill]
recipe = slapos.recipe.template:jinja2
......@@ -251,7 +252,7 @@ md5sum = 043804b76affe91a0bd3686f93f80ac8
[instance-gitlab.cfg.in]
<= download-file
md5sum = 0e7c13b5a5a3ad8748a79eea177b0ce3
md5sum = 5df8d0538f44f3dada2cfd5eb58536eb
[macrolib.cfg.in]
<= download-file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment