Download as
Browse Code »

Commit debce905a56bd35337b2bfa8808b1701f02fbb1a

Authored by Jacob Vosmaer
Committed by Job van der Voort
1 parent c74d1834
Exists in 6-8-stable-ee

Correctly set HOME for Unicorn and Sidekiq 

This fixes a bug where ~git/.gitconfig was being ignored, leading to
CRLF problems in web edits.

Conflicts:
	CHANGELOG
Showing 3 changed files with 6 additions and 2 deletions   Show diff stats
  1 +6.8.1-ee.omnibus
  2 +- Update gitlab-rails to v6.8.1-ee
  3 +
  4 +6.8.0-ee.omnibus
1 - MySQL client support (EE only) 5 - MySQL client support (EE only)
2 - Update to omnibus-ruby 3.0 6 - Update to omnibus-ruby 3.0
3 - Update omnibus-software (e.g. Postgres to 9.2.8) 7 - Update omnibus-software (e.g. Postgres to 9.2.8)
files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb
  Diff comments   View file @debce90
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 cd <%= node['gitlab']['gitlab-rails']['dir'] %>/working 3 cd <%= node['gitlab']['gitlab-rails']['dir'] %>/working
4 4
5 exec 2>&1 5 exec 2>&1
6 -exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['gitlab-rails']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails 6 +exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env BUNDLE_GEMFILE=/opt/gitlab/embedded/service/gitlab-rails/Gemfile HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,gitlab_shell,common,default -e <%= node['gitlab']['gitlab-rails']['environment'] %> -r /opt/gitlab/embedded/service/gitlab-rails
files/gitlab-cookbooks/gitlab/templates/default/sv-unicorn-run.erb
  Diff comments   View file @debce90
@@ -3,4 +3,4 @@ @@ -3,4 +3,4 @@
3 cd /opt/gitlab/embedded/service/gitlab-rails 3 cd /opt/gitlab/embedded/service/gitlab-rails
4 4
5 exec 2>&1 5 exec 2>&1
6 -exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['gitlab-rails']['dir'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-rails']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-rails']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-rails/config.ru 6 +exec chpst -P -U <%= node['gitlab']['user']['username'] %> -u <%= node['gitlab']['user']['username'] %> /usr/bin/env HOME="<%= node['gitlab']['user']['home'] %>" /opt/gitlab/embedded/bin/bundle exec unicorn -E <%= node['gitlab']['gitlab-rails']['environment'] %> -c <%= File.join(node['gitlab']['gitlab-rails']['dir'], "etc", "unicorn.rb") %> /opt/gitlab/embedded/service/gitlab-rails/config.ru