Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index bc0071f6333..d19b8a2d4c6 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -124,9 +124,9 @@ module Gitlab
 
           config[:storage] = storages
 
-          internal_socket_dir = options[: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
+          runtime_dir = options[:runtime_dir] || File.join(gitaly_dir, 'run')
+          FileUtils.mkdir(runtime_dir) unless File.exist?(runtime_dir)
+          config[:runtime_dir] = runtime_dir
 
           config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }