From a5c0b0bd6cd2ac1071c81c6d9b807e0bbc3d75f0 Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@freelancer.com>
Date: Mon, 30 Nov 2015 14:03:12 +1100
Subject: [PATCH] Fix permissions for `public/uploads` directory

---
 manifests/config.pp                | 7 ++++++-
 spec/classes/gitlab_config_spec.rb | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index 149c660..a565bf3 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -53,11 +53,16 @@
       "${git_home}/gitlab/tmp/pids",
       "${git_home}/gitlab/tmp/sockets",
       "${git_home}/gitlab/public",
-      "${git_home}/gitlab/public/uploads",
     ]:
     ensure => directory,
     mode   => '0755',
   }
+  file { [
+      "${git_home}/gitlab/public/uploads",
+    ]:
+    ensure => directory,
+    mode   => '0750',
+  }
 
   #gitlab does not provide an option to configure a log directory, so create a symlink to
   #the desired folder if specified (otherwise, simply ensure the default log folder is there)
diff --git a/spec/classes/gitlab_config_spec.rb b/spec/classes/gitlab_config_spec.rb
index a09407f..7f9310b 100644
--- a/spec/classes/gitlab_config_spec.rb
+++ b/spec/classes/gitlab_config_spec.rb
@@ -83,12 +83,19 @@
         )}
       end # gitlab logrotate
       describe 'gitlab directories' do
-        ['gitlab/tmp','gitlab/tmp/pids','gitlab/tmp/sockets','gitlab/log','gitlab/public','gitlab/public/uploads'].each do |dir|
+        ['gitlab/tmp','gitlab/tmp/pids','gitlab/tmp/sockets','gitlab/log','gitlab/public'].each do |dir|
           it { is_expected.to contain_file("/home/git/#{dir}").with(
             :ensure => 'directory',
             :mode   => '0755'
           )}
         end
+
+        ['gitlab/public/uploads'].each do |dir|
+          it { is_expected.to contain_file("/home/git/#{dir}").with(
+            :ensure => 'directory',
+            :mode   => '0750'
+          )}
+        end
       end # gitlab directories
 
       describe 'no gitlab backup by default' do