From ff2ab63b002bb80e1fa36d3864f2776958ac5b53 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 16 Jul 2014 17:47:21 +0200
Subject: [PATCH] Support the repository_downloads_path setting

---
 CHANGELOG                                                      | 1 +
 files/gitlab-cookbooks/gitlab/attributes/default.rb            | 1 +
 files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb          | 3 ++-
 files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f65c228..dd87654 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,6 +15,7 @@ omnibus-gitlab repository.
 - Only reject SMTP attributes which are nil
 - Support changing the 'restricted_visibility_levels' option (Javier Palomo)
 - Only start omnibus-gitlab services after a given filesystem is mounted
+- Support the repository_downloads_path setting in gitlab.yml
 
 7.0.0-ee.omnibus.1
 - Fix MySQL build for Ubuntu 14.04
diff --git a/files/gitlab-cookbooks/gitlab/attributes/default.rb b/files/gitlab-cookbooks/gitlab/attributes/default.rb
index ed385ec..e7a900e 100644
--- a/files/gitlab-cookbooks/gitlab/attributes/default.rb
+++ b/files/gitlab-cookbooks/gitlab/attributes/default.rb
@@ -67,6 +67,7 @@ default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wiki'] = tru
 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_wall'] = false
 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_snippets'] = false
 default['gitlab']['gitlab-rails']['gitlab_default_projects_features_visibility_level'] = "private"
+default['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'] = nil
 default['gitlab']['gitlab-rails']['issues_tracker_redmine'] = false
 default['gitlab']['gitlab-rails']['issues_tracker_redmine_title'] = "Redmine"
 default['gitlab']['gitlab-rails']['issues_tracker_redmine_project_url'] = "http://redmine.sample/projects/:issues_tracker_id"
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 5ccc7bc..ef23afb 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -31,8 +31,9 @@ gitlab_rails_log_dir = node['gitlab']['gitlab-rails']['log_directory']
   gitlab_rails_tmp_dir,
   gitlab_rails_public_uploads_dir,
   node['gitlab']['gitlab-rails']['backup_path'],
+  node['gitlab']['gitlab-rails']['gitlab_repository_downloads_path'],
   gitlab_rails_log_dir
-].each do |dir_name|
+].compact.each do |dir_name|
   directory dir_name do
     owner node['gitlab']['user']['username']
     mode '0700'
diff --git a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
index 83461a3..e5140bc 100644
--- a/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
+++ b/files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
@@ -74,7 +74,7 @@ production: &base
     ## Repository downloads directory
     # When a user clicks e.g. 'Download zip' on a project, a temporary zip file is created in the following directory.
     # The default is 'tmp/repositories' relative to the root of the Rails app.
-    # repository_downloads_path: tmp/repositories
+    repository_downloads_path: <%= @gitlab_repository_downloads_path %>
 
   ## External issues trackers
   issues_tracker:
--
libgit2 0.21.2