diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-17 02:20:47 +0400 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-17 02:20:47 +0400 |
| commit | eea43c9412fcf1ce8de0230524114b2d643a0e0e (patch) | |
| tree | 8ee2b88cdbc17a0f79256e4034b82a9173123592 /config | |
| parent | 9bc829d3975d70b3a7639a965aa8fbd7ee1f047f (diff) | |
| parent | 471b5910a64d5cbfe268caf210c1745cf3e8fefd (diff) | |
Merge branch 'check_gitlab_in_git_group' of https://github.com/VonC/gitlabhq into VonC-check_gitlab_in_git_group
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 daaa2ff7437..764718ff1db 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) @@ -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 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index eb5c7e74058..d9d14b4ff8b 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({}) |