From a1a6f3cc737e03a8649d7cb98c3ee089133e34d7 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 10 Feb 2016 16:52:02 +0200
Subject: [PATCH] Simplify permissions creation

[ci skip]
---
 doc/install/installation.md | 4 ++--
 lib/tasks/gitlab/check.rake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 0e569d34772..6467a395732 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -268,11 +268,11 @@ sudo usermod -aG redis git
     sudo chmod -R u+rwX tmp/sockets/
 
     # Create the public/uploads/ directory
-    sudo -u git -H mkdir -m 0700 public/uploads/
+    sudo -u git -H mkdir public/uploads/
 
     # Make sure only the GitLab user has access to the public/uploads/ directory
     # now that files in public/uploads are served by gitlab-workhorse
-    sudo chmod -R go-rwX  public/uploads
+    sudo chmod 0700 public/uploads
 
     # Change the permissions of the directory where CI build traces are stored
     sudo chmod -R u+rwX builds/
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index d6e17821d41..69d04400d02 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -285,7 +285,7 @@ namespace :gitlab do
       unless File.directory?(Rails.root.join('public/uploads'))
         puts "no".red
         try_fixing_it(
-          "sudo -u #{gitlab_user} mkdir -m 0700 #{Rails.root}/public/uploads"
+          "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
         )
         for_more_information(
           see_installation_guide_section "GitLab"
-- 
GitLab