diff options
| author | VonC <vonc@laposte.net> | 2013-01-08 19:17:53 +0400 |
|---|---|---|
| committer | VonC <vonc@laposte.net> | 2013-01-14 15:44:27 +0400 |
| commit | 471b5910a64d5cbfe268caf210c1745cf3e8fefd (patch) | |
| tree | d2ef36ab5b19ead59bdcd1302da0ea216d7ef5e8 /config | |
| parent | eff6d3c12b8f1cd0d3f8f9bab8ceaeba31f915b2 (diff) | |
Fix git group detection for gitolite ssh user.
The tasks gitlab:env:info mixes user and group, and presume as a group 'git'.
However, gitolite group name can be anything.
That patch add the git group name in the config,
and check gitolite.ssh_user group against git.group
(which defaults to 'git', as before this patch, if undefined).
M config/gitlab.yml.example:
Add 'group' in 'git' section
Mention default value for the two extra settings
M lib/tasks/gitlab/check.rake:
Check that gitolite.ssh_user *group* is the one defined in git.group.
Make sure to default to 'git' as the expected group
if said group is undefined in the config.
Note: uses a more complete regexp for the group detection
(the group can start, end or be in the middle or the list of groups
of gitolite.ssh_user)
M: config/initializers/1_settings.rb:
Add default values for gitolite.group and gitlab.user
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 76dc6214088..19563584e41 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -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) @@ -100,6 +103,7 @@ gitolite: receive_pack: true ssh_user: git ssh_host: localhost + group: git # default: 'git' if undefined # ssh_port: 22 # config_file: gitolite.conf diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 6b47a9cc948..cd03dd871f2 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -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({}) |