Download as
Browse Code »

Commit 298e6eb6c261fd4037fa8e6b9bc43e7cd529f212

Authored by Dmitriy Zaporozhets
2 parents ffa46e02 4994ebbb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4924 from jameswritescode/update_check_to_verify_update_hook 

update gitlab:check to look for update hook, not post-receive
Showing 1 changed file with 8 additions and 8 deletions   Show diff stats
lib/tasks/gitlab/check.rake
  Diff comments   View file @298e6eb
@@ -374,8 +374,8 @@ namespace :gitlab do @@ -374,8 +374,8 @@ namespace :gitlab do
374 check_repo_base_is_not_symlink 374 check_repo_base_is_not_symlink
375 check_repo_base_user_and_group 375 check_repo_base_user_and_group
376 check_repo_base_permissions 376 check_repo_base_permissions
377 - check_post_receive_hook_is_up_to_date  
378 - check_repos_post_receive_hooks_is_link 377 + check_update_hook_is_up_to_date
  378 + check_repos_update_hooks_is_link
379 379
380 finished_checking "GitLab Shell" 380 finished_checking "GitLab Shell"
381 end 381 end
@@ -385,10 +385,10 @@ namespace :gitlab do @@ -385,10 +385,10 @@ namespace :gitlab do
385 ######################## 385 ########################
386 386
387 387
388 - def check_post_receive_hook_is_up_to_date  
389 - print "post-receive hook up-to-date? ... " 388 + def check_update_hook_is_up_to_date
  389 + print "update hook up-to-date? ... "
390 390
391 - hook_file = "post-receive" 391 + hook_file = "update"
392 gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path 392 gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
393 gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) 393 gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
394 gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user 394 gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
@@ -494,10 +494,10 @@ namespace :gitlab do @@ -494,10 +494,10 @@ namespace :gitlab do
494 end 494 end
495 end 495 end
496 496
497 - def check_repos_post_receive_hooks_is_link  
498 - print "post-receive hooks in repos are links: ... " 497 + def check_repos_update_hooks_is_link
  498 + print "update hooks in repos are links: ... "
499 499
500 - hook_file = "post-receive" 500 + hook_file = "update"
501 gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path 501 gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
502 gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) 502 gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
503 gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user 503 gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user