Permalink
Browse files

Merge branch 'gitolite_custom_config' of dev.gitlabhq.com:gitlabhq

  • Loading branch information...
vsizov committed Nov 6, 2012
2 parents be4138a + 0d4568d commit 62219aa34a9c154480555d6efeab44afca169290
Showing with 9 additions and 1 deletion.
  1. +1 −0 config/gitlab.yml.example
  2. +4 −0 config/initializers/1_settings.rb
  3. +4 −1 lib/gitlab/backend/gitolite_config.rb
@@ -74,6 +74,7 @@ git_host:
upload_pack: true
receive_pack: true
# host: localhost
+ # config_file: gitolite.conf
# port: 22
# Git settings
@@ -104,6 +104,10 @@ def gitolite_admin_uri
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
@@ -14,7 +14,10 @@ def config_tmp_dir
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

0 comments on commit 62219aa

Please sign in to comment.