diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 03:06:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 03:06:18 +0300 |
| commit | ee6b185429b62857a5e490526095a7699e8539f3 (patch) | |
| tree | de54f53b76c5da2bf05cbd333e1910bbe655d653 /lib/gitlab/setup_helper.rb | |
| parent | cf85de264d049f1f8ff14b23f38f8331ae4c60fa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/setup_helper.rb')
| -rw-r--r-- | lib/gitlab/setup_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb index 0d3e78c0a66..c449c6879bc 100644 --- a/lib/gitlab/setup_helper.rb +++ b/lib/gitlab/setup_helper.rb @@ -40,6 +40,11 @@ module Gitlab config = { socket_path: address.sub(/\Aunix:/, ''), storage: storages } config[:auth] = { token: 'secret' } if Rails.env.test? + + internal_socket_dir = File.join(gitaly_dir, 'internal_sockets') + FileUtils.mkdir(internal_socket_dir) unless File.exist?(internal_socket_dir) + config[:internal_socket_dir] = internal_socket_dir + config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path } config[:bin_dir] = Gitlab.config.gitaly.client_path |