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

Fix backslash issues in sv/gitlab-workhorse/run

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1595

See merge request !1005

CHANGELOG.md

@@ -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

files/gitlab-cookbooks/gitlab/templates/default/sv-gitlab-workhorse-run.erb

@@ -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.