deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'stable'

Browse source
This commit is contained in:
Riyad Preukschas 2012-12-24 16:48:32 +01:00
commit dea8628171
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/tasks/gitlab/check.rake
View file

@ -57,7 +57,7 @@ namespace :gitlab do
database_config_file = Rails.root.join("config", "database.yml") database_config_file = Rails.root.join("config", "database.yml")
unless File.read(database_config_file) =~ /sqlite/ unless File.read(database_config_file) =~ /adapter:\s+sqlite/
puts "no".green puts "no".green
else else
puts "yes".red puts "yes".red
@ -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
@ -645,7 +645,6 @@ namespace :gitlab do
hook_file = "post-receive" hook_file = "post-receive"
gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common") gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) gitolite_hook_file = File.join(gitolite_hooks_path, hook_file)
gitolite_hook_content = File.read(gitolite_hook_file)
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
unless File.exists?(gitolite_hook_file) unless File.exists?(gitolite_hook_file)
@ -653,6 +652,7 @@ namespace :gitlab do
return return
end end
gitolite_hook_content = File.read(gitolite_hook_file)
gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file)
gitlab_hook_content = File.read(gitlab_hook_file) gitlab_hook_content = File.read(gitlab_hook_file)