Commit 298e6eb6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #4924 from jameswritescode/update_check_to_verify_update_hook

update gitlab:check to look for update hook, not post-receive
parents ffa46e02 4994ebbb
...@@ -374,8 +374,8 @@ namespace :gitlab do ...@@ -374,8 +374,8 @@ namespace :gitlab do
check_repo_base_is_not_symlink check_repo_base_is_not_symlink
check_repo_base_user_and_group check_repo_base_user_and_group
check_repo_base_permissions check_repo_base_permissions
check_post_receive_hook_is_up_to_date check_update_hook_is_up_to_date
check_repos_post_receive_hooks_is_link check_repos_update_hooks_is_link
finished_checking "GitLab Shell" finished_checking "GitLab Shell"
end end
...@@ -385,10 +385,10 @@ namespace :gitlab do ...@@ -385,10 +385,10 @@ namespace :gitlab do
######################## ########################
def check_post_receive_hook_is_up_to_date def check_update_hook_is_up_to_date
print "post-receive hook up-to-date? ... " print "update hook up-to-date? ... "
hook_file = "post-receive" hook_file = "update"
gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
...@@ -494,10 +494,10 @@ namespace :gitlab do ...@@ -494,10 +494,10 @@ namespace :gitlab do
end end
end end
def check_repos_post_receive_hooks_is_link def check_repos_update_hooks_is_link
print "post-receive hooks in repos are links: ... " print "update hooks in repos are links: ... "
hook_file = "post-receive" hook_file = "update"
gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file)
gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment