deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1313 from LeonB/master

Browse source 
Fixed some hardcoded paths based on issue #1272
This commit is contained in:
Dmitriy Zaporozhets 2012-08-28 07:00:55 -07:00
commit aded7056fd
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/gitlab.yml.example
View file

@ -33,6 +33,7 @@ app:
git_host: git_host:
admin_uri: git@localhost:gitolite-admin admin_uri: git@localhost:gitolite-admin
base_path: /home/git/repositories/ base_path: /home/git/repositories/
# hooks_path: /var/lib/gitolite/.gitolite/hooks/ # only needed when gitolite is not installed according the manual
# host: localhost # host: localhost
git_user: git git_user: git
upload_pack: true upload_pack: true

4
config/initializers/1_settings.rb
View file

@ -66,6 +66,10 @@ class Settings < Settingslogic
git_host['base_path'] || '/home/git/repositories/' git_host['base_path'] || '/home/git/repositories/'
end end
def git_hooks_path
git_host['hooks_path'] || '/home/git/share/gitolite/hooks/'
end
def git_upload_pack def git_upload_pack
if git_host['upload_pack'] != false if git_host['upload_pack'] != false
true true

2
lib/tasks/gitlab/backup.rake
View file

@ -144,7 +144,7 @@ namespace :gitlab do
if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1") if Kernel.system("cd #{File.dirname(project.second)} > /dev/null 2>&1 && git clone --bare #{backup_path_repo}/#{project.first}.bundle #{project.first}.git > /dev/null 2>&1")
permission_commands = [ permission_commands = [
"sudo chmod -R g+rwX #{Gitlab.config.git_base_path}", "sudo chmod -R g+rwX #{Gitlab.config.git_base_path}",
"sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}", "sudo chown -R #{Gitlab.config.ssh_user}:#{Gitlab.config.ssh_user} #{Gitlab.config.git_base_path}"
] ]
permission_commands.each { |command| Kernel.system(command) } permission_commands.each { |command| Kernel.system(command) }
puts "[DONE]".green puts "[DONE]".green

2
lib/tasks/gitlab/status.rake
View file

@ -56,7 +56,7 @@ namespace :gitlab do
return return
end end
gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common") gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
gitlab_hook_files = ['post-receive'] gitlab_hook_files = ['post-receive']
gitlab_hook_files.each do |file_name| gitlab_hook_files.each do |file_name|
dest = File.join(gitolite_hooks_path, file_name) dest = File.join(gitolite_hooks_path, file_name)

2
lib/tasks/gitlab/write_hook.rake
View file

@ -2,7 +2,7 @@ namespace :gitlab do
namespace :gitolite do namespace :gitolite do
desc "GITLAB | Write GITLAB hook for gitolite" desc "GITLAB | Write GITLAB hook for gitolite"
task :write_hooks => :environment do task :write_hooks => :environment do
gitolite_hooks_path = File.join("/home", Gitlab.config.ssh_user, "share", "gitolite", "hooks", "common") gitolite_hooks_path = File.join(Gitlab.config.git_hooks_path, "common")
gitlab_hooks_path = Rails.root.join("lib", "hooks") gitlab_hooks_path = Rails.root.join("lib", "hooks")
gitlab_hook_files = ['post-receive'] gitlab_hook_files = ['post-receive']