diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-11-07 00:47:33 +0200 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-11-07 00:47:33 +0200 |
| commit | 0d4568db783f0b5c9e4049fb37056e4acbba36ed (patch) | |
| tree | 377ae61774ffa180c26a2f946a9ca2e296a7ed49 | |
| parent | be4138af75b2a80ceb7d444c573fc35c644d9c63 (diff) | |
| download | gitlab-ce-0d4568db783f0b5c9e4049fb37056e4acbba36ed.tar.gz | |
gitolite custom config
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/backend/gitolite_config.rb | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 28323484a37..3568348971b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -74,6 +74,7 @@ git_host: upload_pack: true receive_pack: true # host: localhost + # config_file: gitolite.conf # port: 22 # Git settings diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index fb809636557..32af3d07778 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -104,6 +104,10 @@ class Settings < Settingslogic git_host['admin_uri'] || 'git@localhost:gitolite-admin' end + def gitolite_config_file + git_host['config_file'] || 'gitolite.conf' + end + def gitolite_admin_key git_host['gitolite_admin_key'] || 'gitlab' end diff --git a/lib/gitlab/backend/gitolite_config.rb b/lib/gitlab/backend/gitolite_config.rb index d988164d439..1bef19a2a79 100644 --- a/lib/gitlab/backend/gitolite_config.rb +++ b/lib/gitlab/backend/gitolite_config.rb @@ -14,7 +14,10 @@ module Gitlab end def ga_repo - @ga_repo ||= ::Gitolite::GitoliteAdmin.new(File.join(config_tmp_dir,'gitolite')) + @ga_repo ||= ::Gitolite::GitoliteAdmin.new( + File.join(config_tmp_dir,'gitolite'), + conf: Gitlab.config.gitolite_config_file + ) end def apply |