Commit e20e5ff5 authored by DJ Mountney's avatar DJ Mountney

Merge branch '1595-workhorse-run-order' into 'master'

Fix backslash issues in sv/gitlab-workhorse/run

Closes #1595

See merge request !1005
parents 911841c4 a31df937
......@@ -7,6 +7,10 @@ omnibus-gitlab repository.
- Add support for registry debug addr configuration
8.12.1
- Fix gitlab-workhorse Runit template bug #1595 !1005
8.12.0
- Add support for using NFS root_squash for storage directories d5cf0d1d
......
......@@ -20,6 +20,8 @@ exec chpst -e /opt/gitlab/etc/gitlab-workhorse/env -P \
-documentRoot /opt/gitlab/embedded/service/gitlab-rails/public \
-pprofListenAddr <%= node['gitlab']['gitlab-workhorse']['pprof_listen_addr'] %>\
<% if node['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] %>
-proxyHeadersTimeout <%= node['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] %>
-proxyHeadersTimeout <%= node['gitlab']['gitlab-workhorse']['proxy_headers_timeout'] %> \
<% end %>
-secretPath /opt/gitlab/embedded/service/gitlab-rails/.gitlab_workhorse_secret
-secretPath /opt/gitlab/embedded/service/gitlab-rails/.gitlab_workhorse_secret \
# Do not remove this line; it prevents trouble with the trailing backslashes above.
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