Skip to content
Snippets Groups Projects
Commit 0d4568db authored by Valeriy Sizov's avatar Valeriy Sizov
Browse files

gitolite custom config

parent be4138af
No related branches found
No related tags found
No related merge requests found
Loading
@@ -74,6 +74,7 @@ git_host:
Loading
@@ -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
Loading
Loading
Loading
@@ -104,6 +104,10 @@ class Settings < Settingslogic
Loading
@@ -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
Loading
Loading
Loading
@@ -14,7 +14,10 @@ module Gitlab
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment