diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-12 16:32:46 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-12 16:32:46 +0300 |
commit | 8b0d2283d77df0e99f5f49db3f78f6101ac1b8ef (patch) | |
tree | a3b9796d29da06ddf83fbe8dec1def9b972bec65 /lib/tasks | |
parent | a2785eb82e0e016c71ed3d5d7747c52e6a2e9682 (diff) | |
parent | f376347f24f24efc157d80de63381dd22d060630 (diff) |
Merge branch 'gitaly-disk-access-3' into 'master'
Find and mark more Git disk access locations, part 2
See merge request gitlab-org/gitlab-ce!19437
Diffstat (limited to 'lib/tasks')
-rw-r--r-- | lib/tasks/gitlab/check.rake | 12 | ||||
-rw-r--r-- | lib/tasks/gitlab/info.rake | 6 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index c04dae7446f..a8acafa9cd9 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -44,11 +44,13 @@ namespace :gitlab do start_checking "GitLab Shell" check_gitlab_shell - check_repo_base_exists - check_repo_base_is_not_symlink - check_repo_base_user_and_group - check_repo_base_permissions - check_repos_hooks_directory_is_link + Gitlab::GitalyClient::StorageSettings.allow_disk_access do + check_repo_base_exists + check_repo_base_is_not_symlink + check_repo_base_user_and_group + check_repo_base_permissions + check_repos_hooks_directory_is_link + end check_gitlab_shell_self_test finished_checking "GitLab Shell" diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index 289aa5d9060..6de739e9515 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -67,8 +67,10 @@ namespace :gitlab do puts "GitLab Shell".color(:yellow) puts "Version:\t#{gitlab_shell_version || "unknown".color(:red)}" puts "Repository storage paths:" - Gitlab.config.repositories.storages.each do |name, repository_storage| - puts "- #{name}: \t#{repository_storage.legacy_disk_path}" + Gitlab::GitalyClient::StorageSettings.allow_disk_access do + Gitlab.config.repositories.storages.each do |name, repository_storage| + puts "- #{name}: \t#{repository_storage.legacy_disk_path}" + end end puts "Hooks:\t\t#{Gitlab.config.gitlab_shell.hooks_path}" puts "Git:\t\t#{Gitlab.config.git.bin_path}" |