From 0d4568db783f0b5c9e4049fb37056e4acbba36ed Mon Sep 17 00:00:00 2001
From: Valeriy Sizov <vsv2711@gmail.com>
Date: Wed, 7 Nov 2012 00:47:33 +0200
Subject: [PATCH] gitolite custom config

---
 config/gitlab.yml.example             | 1 +
 config/initializers/1_settings.rb     | 4 ++++
 lib/gitlab/backend/gitolite_config.rb | 5 ++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 28323484..35683489 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 fb809636..32af3d07 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 d988164d..1bef19a2 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