Download as
Browse Code »

Commit 3ffb9cbfa930d3105560dbf86cd39d301feb1170

Authored by Zevs
1 parent a0db028c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Task#879 Relocated gitolite repo and lock file

Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
lib/gitlab/gitolite.rb
  Diff comments   View file @3ffb9cb
@@ -16,7 +16,7 @@ module Gitlab @@ -16,7 +16,7 @@ module Gitlab
16 16
17 def pull 17 def pull
18 # create tmp dir 18 # create tmp dir
19 - @local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}") 19 + @local_dir = File.join(Rails.root, 'tmp',"gitlabhq-gitolite-#{Time.now.to_i}")
20 Dir.mkdir @local_dir 20 Dir.mkdir @local_dir
21 21
22 `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite` 22 `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite`
@@ -33,8 +33,8 @@ module Gitlab @@ -33,8 +33,8 @@ module Gitlab
33 end 33 end
34 34
35 def configure 35 def configure
36 - status = Timeout::timeout(20) do  
37 - File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f| 36 + Timeout::timeout(20) do
  37 + File.open(File.join(Rails.root, 'tmp', "gitlabhq-gitolite.lock"), "w+") do |f|
38 begin 38 begin
39 f.flock(File::LOCK_EX) 39 f.flock(File::LOCK_EX)
40 pull 40 pull