Commit 788e9e94 by Kirill Smelkov

gitlab: Fix 500 when downloading archive.tar.gz and archive.tar.bz2

It was failing because gzip was not on PATH for gitlab-workhorse
service.

    2016/04/22 18:44:56 error: handleGetArchive: start [gzip -c -n]: exec: "gzip": executable file not found in $PATH

The same for bzip2. Fix it.

/reported-by @jm
1 parent b97b1731
......@@ -533,7 +533,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
PATH={{ git_location }}/bin:{{ ruby_location }}/bin:{{ gzip_location }}/bin:{{ bzip2_location}}/bin
HOME=${directory:home}
depend =
......
......@@ -31,6 +31,7 @@ context =
# program binaries
raw bash_bin ${bash:location}/bin/bash
raw bzip2_location ${bzip2:location}
raw bundler_4gitlab ${bundler-4gitlab:bundle}
raw curl_bin ${curl:location}/bin/curl
raw dcron_bin ${dcron-output:crond}
......@@ -39,6 +40,7 @@ context =
raw gitlab_workhorse ${gitlab-workhorse:location}/gitlab-workhorse
raw gunzip_bin ${gzip:location}/bin/gunzip
raw gzip_bin ${gzip:location}/bin/gzip
raw gzip_location ${gzip:location}
raw logrotate_bin ${logrotate:location}/usr/sbin/logrotate
raw nginx_bin ${nginx-output:nginx}
raw nginx_mime_types ${nginx-output:mime}
......
......@@ -15,6 +15,7 @@ extends =
# for instance
../../component/bash/buildout.cfg
../../component/bzip2/buildout.cfg
../../component/curl/buildout.cfg
../../component/gzip/buildout.cfg
../../component/dcron/buildout.cfg
......@@ -193,7 +194,7 @@ eggs =
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg.in
output = ${buildout:directory}/instance.cfg
md5sum = b40cd8824b978da867404d8955b06c18
md5sum = e5e7ddede71265987bb0c534b009aa45
[watcher-sigkill]
recipe = slapos.recipe.template:jinja2
......@@ -251,7 +252,7 @@ md5sum = 8f1c52ed223ee2c2d07c6c79bcd2f6c0
[instance-gitlab.cfg.in]
<= download-file
md5sum = bc8d3734e6c73750acc4558acfbc7fc9
md5sum = de4c2067597b39fb7db06c15ce6a1878
[macrolib.cfg.in]
<= download-file
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!