diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 76dc62140881aecc1fb85142cb379dbcbf8cf138..2632cba5b6dd99f0e13113d9fd1994e9f52d9675 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 fd3e83e833875d5f325d81ed2546ca7e1c66e62a..845b923a6fcae0c5f29b219042ac86db6cf0206b 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}"