Commit eea43c94 authored by Riyad Preukschas's avatar Riyad Preukschas

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

Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group
parents 9bc829d3 471b5910
No related merge requests found
......@@ -29,6 +29,9 @@ gitlab:
## Project settings
default_projects_limit: 10
## Account used for GitLab installation ('gitlab' if undefined)
user: gitlab
## Gravatar
gravatar:
enabled: true # Use user avatar images from Gravatar.com (default: true)
......@@ -104,6 +107,7 @@ gitolite:
receive_pack: true
ssh_user: git
ssh_host: localhost
group: git # default: 'git' if undefined
# ssh_port: 22
# config_file: gitolite.conf
......
......@@ -50,6 +50,7 @@ Settings.gitlab['relative_url_root'] ||= ''
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
Settings.gitlab['user'] ||= 'gitlab'
Settings['gravatar'] ||= Settingslogic.new({})
Settings.gravatar['enabled'] ||= true
......@@ -67,6 +68,7 @@ Settings.gitolite['upload_pack'] ||= (Settings.gitolite['upload_pack'] != false
Settings.gitolite['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
Settings.gitolite['ssh_port'] ||= 22
Settings.gitolite['ssh_user'] ||= 'git'
Settings.gitolite['group'] ||= 'git'
Settings.gitolite['ssh_path_prefix'] ||= Settings.send(:build_gitolite_ssh_path_prefix)
Settings['backup'] ||= Settingslogic.new({})
......
......@@ -295,15 +295,16 @@ namespace :gitlab do
end
def check_gitlab_in_git_group
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "gitlab user is in #{gitolite_ssh_user} group? ... "
gitlab_user = Gitlab.config.gitlab.user
gitolite_group = Gitlab.config.gitolite.group
print "gitlab user '#{gitlab_user}' has git group '#{gitolite_group}'? ... "
if run_and_match("id -rnG", /\Wgit\W/)
if run_and_match("id -rnG", /^#{gitolite_group}\W|\W#{gitolite_group}\W|\W#{gitolite_group}$/)
puts "yes".green
else
puts "no".red
try_fixing_it(
"sudo usermod -a -G #{gitolite_ssh_user} gitlab"
"sudo usermod -a -G #{gitolite_group} #{gitlab_user}"
)
for_more_information(
see_installation_guide_section "System Users"
......
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