Merge branch 'master' of github.com:gitlabhq/gitlabhq

doc/install/installation.md

@@ -181,7 +181,7 @@ You can change `6-9-stable` to `master` if you want the *bleeding edge* version,
 
     # Create directory for satellites
     sudo -u git -H mkdir /home/git/gitlab-satellites
-    sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+    sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
 
     # Make sure GitLab can write to the tmp/pids/ and tmp/sockets/ directories
     sudo chmod -R u+rwX tmp/pids/

doc/update/6.6-to-6.7.md

@@ -69,7 +69,7 @@ sudo -u git -H gzip /home/git/gitlab/log/*.log.1
 sudo -u git -H gzip /home/git/gitlab-shell/gitlab-shell.log.1
 
 # Close access to gitlab-satellites for others
-sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
 ```
 
 

doc/update/6.7-to-6.8.md

@@ -65,7 +65,7 @@ sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
 sudo chmod +x /etc/init.d/gitlab
 
 # Close access to gitlab-satellites for others
-sudo chmod u+rwx,g+rx,o-rwx /home/git/gitlab-satellites
+sudo chmod u+rwx,g=rx,o-rwx /home/git/gitlab-satellites
 ```
 
 ### 5. Update config files

lib/support/init.d/gitlab

@@ -12,6 +12,7 @@
 # Default-Stop:      0 1 6
 # Short-Description: GitLab git repository management
 # Description:       GitLab git repository management
+# chkconfig: - 85 14
 ### END INIT INFO
 
 

lib/tasks/gitlab/check.rake

@@ -458,7 +458,7 @@ namespace :gitlab do
       else
         puts "no".red
         try_fixing_it(
-          "sudo chmod u+rwx,g+rx,o-rwx #{satellites_path}",
+          "sudo chmod u+rwx,g=rx,o-rwx #{satellites_path}",
         )
         for_more_information(
           see_installation_guide_section "GitLab"