From b40738cafdfef1c1869936b561ff5123f8ae21cb Mon Sep 17 00:00:00 2001 From: VonC Date: Tue, 8 Jan 2013 14:05:14 +0000 Subject: [PATCH] Fix gitolite installation path in gitlab:env:info (related to #2480 and #2503) This tasks presume of a fixed path for gitolite, relative to repos_path. info.rake uses "#{Gitlab.config.gitolite.repos_path}/../gitolite/src/VERSION" However, you can install gitolite wherever you want. Hence this patch, adding a new setting in gitlab.yml. If the user doesn't add it, gitolite installation path will be the same than before. M config/gitlab.yml.example: Add 'install_path' in 'gitolite' section M lib/tasks/gitlab/info.rake: Uses '"#{Gitlab.config.gitolite.install_path}' If undefined, defaults to '{repos_path}/../gitolite/src/', as before --- config/gitlab.yml.example | 1 + lib/tasks/gitlab/info.rake | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 76dc6214088..2632cba5b6d 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -91,6 +91,7 @@ backup: ## Gitolite settings gitolite: + install_path: /home/git/gitolite/src/ # if not defined, defaults to 'repos_path/../gitolite/src/' admin_uri: git@localhost:gitolite-admin # repos_path must not be a symlink repos_path: /home/git/repositories/ diff --git a/lib/tasks/gitlab/info.rake b/lib/tasks/gitlab/info.rake index fd3e83e8338..845b923a6fc 100644 --- a/lib/tasks/gitlab/info.rake +++ b/lib/tasks/gitlab/info.rake @@ -68,13 +68,18 @@ namespace :gitlab do # check Gitolite version - gitolite_version_file = "#{Gitlab.config.gitolite.repos_path}/../gitolite/src/VERSION" + gitolite_install_path = "#{Gitlab.config.gitolite.install_path}" + if Dir[gitolite_install_path] == [] + gitolite_install_path = "#{Gitlab.config.gitolite.repos_path}/../gitolite/src/" + end + gitolite_version_file = "#{gitolite_install_path}/VERSION" if File.exists?(gitolite_version_file) && File.readable?(gitolite_version_file) gitolite_version = File.read(gitolite_version_file) end puts "" puts "Gitolite information".yellow + puts "Installation:\t#{gitolite_install_path}" puts "Version:\t#{gitolite_version || "unknown".red}" puts "Admin URI:\t#{Gitlab.config.gitolite.admin_uri}" puts "Admin Key:\t#{Gitlab.config.gitolite.admin_key}" -- GitLab