From e2f7286319797be78778dd93ab5c4d4ee40fe1c4 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 15 Aug 2014 11:12:48 +0200
Subject: [PATCH] Fix missing sidekiq.log in the admin interface

---
 CHANGELOG                                             | 1 +
 files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb | 6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 55d823d..7ee90b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ omnibus-gitlab repository.
 - Enable the 'ssh_host' field in gitlab.yml (Florent Baldino)
 - Create git's home directory if necessary
 - Update openssl to 1.0.1i
+- Fix missing sidekiq.log in the GitLab admin interface
 
 7.1.0
 - Build: explicitly use .forward for sending notifications
diff --git a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
index 27cda62..f300414 100644
--- a/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
+++ b/files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
@@ -188,6 +188,12 @@ end
   end
 end
 
+legacy_sidekiq_log_file = File.join(gitlab_rails_log_dir, 'sidekiq.log')
+link legacy_sidekiq_log_file do
+  to File.join(node['gitlab']['sidekiq']['log_directory'], 'current')
+  not_if { File.exists?(legacy_sidekiq_log_file) }
+end
+
 # Make schema.rb writable for when we run `rake db:migrate`
 file "/opt/gitlab/embedded/service/gitlab-rails/db/schema.rb" do
   owner node['gitlab']['user']['username']
--
libgit2 0.21.2