Commit c9e6818a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Store repo satellites outside of tmp directory

parent 3d57755b
...@@ -84,6 +84,10 @@ omniauth: ...@@ -84,6 +84,10 @@ omniauth:
# 3. Advanced settings # 3. Advanced settings
# ========================== # ==========================
# GitLab Satellites
satellites:
path: /home/gitlab/gitlab-satellites/
## Backup settings ## Backup settings
backup: backup:
path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/)
......
...@@ -77,3 +77,5 @@ Settings['git'] ||= Settingslogic.new({}) ...@@ -77,3 +77,5 @@ Settings['git'] ||= Settingslogic.new({})
Settings.git['max_size'] ||= 5242880 # 5.megabytes Settings.git['max_size'] ||= 5242880 # 5.megabytes
Settings.git['bin_path'] ||= '/usr/bin/git' Settings.git['bin_path'] ||= '/usr/bin/git'
Settings.git['timeout'] ||= 10 Settings.git['timeout'] ||= 10
Settings.satellites['path'] ||= '/home/gitlab/gitlab/tmp/repo_satellites/'
...@@ -223,6 +223,9 @@ do so with caution! ...@@ -223,6 +223,9 @@ do so with caution!
sudo chmod -R u+rwX log/ sudo chmod -R u+rwX log/
sudo chmod -R u+rwX tmp/ sudo chmod -R u+rwX tmp/
# Make directory for satellites
sudo -u gitlab -H mkdir /home/gitlab/gitlab-satellites
# Copy the example Unicorn config # Copy the example Unicorn config
sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb sudo -u gitlab -H cp config/unicorn.rb.example config/unicorn.rb
......
...@@ -57,7 +57,7 @@ module Gitlab ...@@ -57,7 +57,7 @@ module Gitlab
end end
def path def path
Rails.root.join("tmp", "repo_satellites", project.path_with_namespace) File.join(Gitlab.config.satellites.path, project.path_with_namespace)
end end
def repo def repo
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment