Download as
Browse Code »

Commit c9e6818ab64d7ec9219887174b613fe69791bb92

Authored by Dmitriy Zaporozhets
1 parent 3d57755b
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Store repo satellites outside of tmp directory

Showing 4 changed files with 10 additions and 1 deletions   Show diff stats
config/gitlab.yml.example
  Diff comments   View file @c9e6818
@@ -84,6 +84,10 @@ omniauth: @@ -84,6 +84,10 @@ omniauth:
84 # 3. Advanced settings 84 # 3. Advanced settings
85 # ========================== 85 # ==========================
86 86
  87 +# GitLab Satellites
  88 +satellites:
  89 + path: /home/gitlab/gitlab-satellites/
  90 +
87 ## Backup settings 91 ## Backup settings
88 backup: 92 backup:
89 path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) 93 path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/)
config/initializers/1_settings.rb
  Diff comments   View file @c9e6818
@@ -77,3 +77,5 @@ Settings['git'] ||= Settingslogic.new({}) @@ -77,3 +77,5 @@ Settings['git'] ||= Settingslogic.new({})
77 Settings.git['max_size'] ||= 5242880 # 5.megabytes 77 Settings.git['max_size'] ||= 5242880 # 5.megabytes
78 Settings.git['bin_path'] ||= '/usr/bin/git' 78 Settings.git['bin_path'] ||= '/usr/bin/git'
79 Settings.git['timeout'] ||= 10 79 Settings.git['timeout'] ||= 10
  80 +
  81 +Settings.satellites['path'] ||= '/home/gitlab/gitlab/tmp/repo_satellites/'
doc/install/installation.md
  Diff comments   View file @c9e6818
@@ -223,6 +223,9 @@ do so with caution! @@ -223,6 +223,9 @@ do so with caution!
223 sudo chmod -R u+rwX log/ 223 sudo chmod -R u+rwX log/
224 sudo chmod -R u+rwX tmp/ 224 sudo chmod -R u+rwX tmp/
225 225
  226 + # Make directory for satellites
  227 + sudo -u gitlab -H mkdir /home/gitlab/gitlab-satellites
  228 +
226 # Copy the example Unicorn config 229 # Copy the example Unicorn config
227 sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb 230 sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb
228 231
lib/gitlab/satellite/satellite.rb
  Diff comments   View file @c9e6818
@@ -57,7 +57,7 @@ module Gitlab @@ -57,7 +57,7 @@ module Gitlab
57 end 57 end
58 58
59 def path 59 def path
60 - Rails.root.join("tmp", "repo_satellites", project.path_with_namespace) 60 + File.join(Gitlab.config.satellites.path, project.path_with_namespace)
61 end 61 end
62 62
63 def repo 63 def repo