Commit 62219aa3 authored by Valery Sizov's avatar Valery Sizov

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

parents be4138af 0d4568db
...@@ -74,6 +74,7 @@ git_host: ...@@ -74,6 +74,7 @@ git_host:
upload_pack: true upload_pack: true
receive_pack: true receive_pack: true
# host: localhost # host: localhost
# config_file: gitolite.conf
# port: 22 # port: 22
# Git settings # Git settings
......
...@@ -104,6 +104,10 @@ class Settings < Settingslogic ...@@ -104,6 +104,10 @@ class Settings < Settingslogic
git_host['admin_uri'] || 'git@localhost:gitolite-admin' git_host['admin_uri'] || 'git@localhost:gitolite-admin'
end end
def gitolite_config_file
git_host['config_file'] || 'gitolite.conf'
end
def gitolite_admin_key def gitolite_admin_key
git_host['gitolite_admin_key'] || 'gitlab' git_host['gitolite_admin_key'] || 'gitlab'
end end
......
...@@ -14,7 +14,10 @@ module Gitlab ...@@ -14,7 +14,10 @@ module Gitlab
end end
def ga_repo 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 end
def apply def apply
......
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