Commit d9ca1bce7a52709aa9d1aa60940cab69861e09c0
1 parent
a9e2fa4c
Exists in
master
and in
4 other branches
Fix paths in gitlab:check
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
lib/tasks/gitlab/check.rake
| @@ -317,7 +317,7 @@ namespace :gitlab do | @@ -317,7 +317,7 @@ namespace :gitlab do | ||
| 317 | gitolite_ssh_user = Gitlab.config.gitolite.ssh_user | 317 | gitolite_ssh_user = Gitlab.config.gitolite.ssh_user |
| 318 | print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... " | 318 | print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... " |
| 319 | 319 | ||
| 320 | - profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile") | 320 | + profile_file = File.join(gitolite_home, ".profile") |
| 321 | 321 | ||
| 322 | unless File.read(profile_file) =~ /^-e PATH/ | 322 | unless File.read(profile_file) =~ /^-e PATH/ |
| 323 | puts "yes".green | 323 | puts "yes".green |
| @@ -474,7 +474,7 @@ namespace :gitlab do | @@ -474,7 +474,7 @@ namespace :gitlab do | ||
| 474 | def check_dot_gitolite_exists | 474 | def check_dot_gitolite_exists |
| 475 | print "Config directory exists? ... " | 475 | print "Config directory exists? ... " |
| 476 | 476 | ||
| 477 | - gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite") | 477 | + gitolite_config_path = File.join(gitolite_home, ".gitolite") |
| 478 | 478 | ||
| 479 | if File.directory?(gitolite_config_path) | 479 | if File.directory?(gitolite_config_path) |
| 480 | puts "yes".green | 480 | puts "yes".green |
| @@ -495,7 +495,7 @@ namespace :gitlab do | @@ -495,7 +495,7 @@ namespace :gitlab do | ||
| 495 | def check_dot_gitolite_permissions | 495 | def check_dot_gitolite_permissions |
| 496 | print "Config directory access is drwxr-x---? ... " | 496 | print "Config directory access is drwxr-x---? ... " |
| 497 | 497 | ||
| 498 | - gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite") | 498 | + gitolite_config_path = File.join(gitolite_home, ".gitolite") |
| 499 | unless File.exists?(gitolite_config_path) | 499 | unless File.exists?(gitolite_config_path) |
| 500 | puts "can't check because of previous errors".magenta | 500 | puts "can't check because of previous errors".magenta |
| 501 | return | 501 | return |
| @@ -519,7 +519,7 @@ namespace :gitlab do | @@ -519,7 +519,7 @@ namespace :gitlab do | ||
| 519 | gitolite_ssh_user = Gitlab.config.gitolite.ssh_user | 519 | gitolite_ssh_user = Gitlab.config.gitolite.ssh_user |
| 520 | print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... " | 520 | print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... " |
| 521 | 521 | ||
| 522 | - gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite") | 522 | + gitolite_config_path = File.join(gitolite_home, ".gitolite") |
| 523 | unless File.exists?(gitolite_config_path) | 523 | unless File.exists?(gitolite_config_path) |
| 524 | puts "can't check because of previous errors".magenta | 524 | puts "can't check because of previous errors".magenta |
| 525 | return | 525 | return |