1 files changed, 12 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb
index 668de75f663..4c7be04246c 100644
--- a/lib/gitlab/satellite/satellite.rb
+++ b/lib/gitlab/satellite/satellite.rb
@@ -64,7 +64,8 @@ module Gitlab
       end
 
       def lock_file
-        Rails.root.join("tmp", "satellite_#{project.id}.lock")
+        create_locks_dir unless File.exists?(lock_files_dir)
+        File.join(lock_files_dir, "satellite_#{project.id}.lock")
       end
 
       def path
@@ -114,6 +115,16 @@ module Gitlab
       def update_from_source!
         repo.git.fetch({timeout: true}, :origin)
       end
+
+      # Create directory for stroing
+      # satellites lock files
+      def create_locks_dir
+        FileUtils.mkdir_p(lock_files_dir)
+      end
+
+      def lock_files_dir
+        @lock_files_dir ||= File.join(Gitlab.config.satellites.path, "tmp")
+      end
     end
   end
 end