Download as
Browse Code »

Commit eea43c9412fcf1ce8de0230524114b2d643a0e0e

Authored by Riyad Preukschas
2 parents 9bc829d3 471b5910
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq int… 

…o VonC-check_gitlab_in_git_group
Showing 3 changed files with 11 additions and 4 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @eea43c9
@@ -29,6 +29,9 @@ gitlab: @@ -29,6 +29,9 @@ gitlab:
29 ## Project settings 29 ## Project settings
30 default_projects_limit: 10 30 default_projects_limit: 10
31 31
  32 + ## Account used for GitLab installation ('gitlab' if undefined)
  33 + user: gitlab
  34 +
32 ## Gravatar 35 ## Gravatar
33 gravatar: 36 gravatar:
34 enabled: true # Use user avatar images from Gravatar.com (default: true) 37 enabled: true # Use user avatar images from Gravatar.com (default: true)
@@ -104,6 +107,7 @@ gitolite: @@ -104,6 +107,7 @@ gitolite:
104 receive_pack: true 107 receive_pack: true
105 ssh_user: git 108 ssh_user: git
106 ssh_host: localhost 109 ssh_host: localhost
  110 + group: git # default: 'git' if undefined
107 # ssh_port: 22 111 # ssh_port: 22
108 # config_file: gitolite.conf 112 # config_file: gitolite.conf
109 113
config/initializers/1_settings.rb
  Diff comments   View file @eea43c9
@@ -50,6 +50,7 @@ Settings.gitlab['relative_url_root'] ||= '' @@ -50,6 +50,7 @@ Settings.gitlab['relative_url_root'] ||= ''
50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http" 50 Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}" 51 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
52 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) 52 Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
  53 +Settings.gitlab['user'] ||= 'gitlab'
53 54
54 Settings['gravatar'] ||= Settingslogic.new({}) 55 Settings['gravatar'] ||= Settingslogic.new({})
55 Settings.gravatar['enabled'] ||= true 56 Settings.gravatar['enabled'] ||= true
@@ -67,6 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false @@ -67,6 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false
67 Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost') 68 Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
68 Settings.gitolite['ssh_port'] ||= 22 69 Settings.gitolite['ssh_port'] ||= 22
69 Settings.gitolite['ssh_user'] ||= 'git' 70 Settings.gitolite['ssh_user'] ||= 'git'
  71 +Settings.gitolite['group'] ||= 'git'
70 Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix) 72 Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix)
71 73
72 Settings['backup'] ||= Settingslogic.new({}) 74 Settings['backup'] ||= Settingslogic.new({})
lib/tasks/gitlab/check.rake
  Diff comments   View file @eea43c9
@@ -295,15 +295,16 @@ namespace :gitlab do @@ -295,15 +295,16 @@ namespace :gitlab do
295 end 295 end
296 296
297 def check_gitlab_in_git_group 297 def check_gitlab_in_git_group
298 - gitolite_ssh_user = Gitlab.config.gitolite.ssh_user  
299 - print "gitlab user is in #{gitolite_ssh_user} group? ... " 298 + gitlab_user = Gitlab.config.gitlab.user
  299 + gitolite_group = Gitlab.config.gitolite.group
  300 + print "gitlab user '#{gitlab_user}' has git group '#{gitolite_group}'? ... "
300 301
301 - if run_and_match("id -rnG", /\Wgit\W/) 302 + if run_and_match("id -rnG", /^#{gitolite_group}\W|\W#{gitolite_group}\W|\W#{gitolite_group}$/)
302 puts "yes".green 303 puts "yes".green
303 else 304 else
304 puts "no".red 305 puts "no".red
305 try_fixing_it( 306 try_fixing_it(
306 - "sudo usermod -a -G #{gitolite_ssh_user} gitlab" 307 + "sudo usermod -a -G #{gitolite_group} #{gitlab_user}"
307 ) 308 )
308 for_more_information( 309 for_more_information(
309 see_installation_guide_section "System Users" 310 see_installation_guide_section "System Users"