Fix paths in gitlab:check
This commit is contained in:
parent
a9e2fa4c35
commit
d9ca1bce7a
|
@ -317,7 +317,7 @@ namespace :gitlab do
|
||||||
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
|
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
|
||||||
print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... "
|
print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... "
|
||||||
|
|
||||||
profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile")
|
profile_file = File.join(gitolite_home, ".profile")
|
||||||
|
|
||||||
unless File.read(profile_file) =~ /^-e PATH/
|
unless File.read(profile_file) =~ /^-e PATH/
|
||||||
puts "yes".green
|
puts "yes".green
|
||||||
|
@ -474,7 +474,7 @@ namespace :gitlab do
|
||||||
def check_dot_gitolite_exists
|
def check_dot_gitolite_exists
|
||||||
print "Config directory exists? ... "
|
print "Config directory exists? ... "
|
||||||
|
|
||||||
gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
|
gitolite_config_path = File.join(gitolite_home, ".gitolite")
|
||||||
|
|
||||||
if File.directory?(gitolite_config_path)
|
if File.directory?(gitolite_config_path)
|
||||||
puts "yes".green
|
puts "yes".green
|
||||||
|
@ -495,7 +495,7 @@ namespace :gitlab do
|
||||||
def check_dot_gitolite_permissions
|
def check_dot_gitolite_permissions
|
||||||
print "Config directory access is drwxr-x---? ... "
|
print "Config directory access is drwxr-x---? ... "
|
||||||
|
|
||||||
gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
|
gitolite_config_path = File.join(gitolite_home, ".gitolite")
|
||||||
unless File.exists?(gitolite_config_path)
|
unless File.exists?(gitolite_config_path)
|
||||||
puts "can't check because of previous errors".magenta
|
puts "can't check because of previous errors".magenta
|
||||||
return
|
return
|
||||||
|
@ -519,7 +519,7 @@ namespace :gitlab do
|
||||||
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
|
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
|
||||||
print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... "
|
print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... "
|
||||||
|
|
||||||
gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite")
|
gitolite_config_path = File.join(gitolite_home, ".gitolite")
|
||||||
unless File.exists?(gitolite_config_path)
|
unless File.exists?(gitolite_config_path)
|
||||||
puts "can't check because of previous errors".magenta
|
puts "can't check because of previous errors".magenta
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in a new issue